[mkgmap-dev] Commit: r3449: Merge the mixed-index branch.