[mkgmap-dev] Commit: r672: Merged from trunk