[mkgmap-dev] Commit: r1497: Merge the mp branch to trunk.