[mkgmap-dev] Commit: r686: Merge in from trunk.