[mkgmap-dev] Commit: r3211: Merge from the sort2 branch. Index fixes.