[mkgmap-dev] Commit: r954: Merged from trunk.