[mkgmap-dev] Commit: r694: Merge the style branch back to the trunk.