[mkgmap-dev] Commit: r699: Merge in important bug fixes from the style branch.