[mkgmap-dev] Commit: r1363: Merge the mapset branch back to trunk.