[mkgmap-dev] Commit: r1548: Merge the style branch.