[mkgmap-dev] Commit: r682: Merge from trunk