[mkgmap-dev] Commit: r2630: merge overview2 branch