[mkgmap-dev] Commit: r3258: merge the performance2 branch