[mkgmap-dev] Commit: r3221: merge the refactoring branch