[mkgmap-dev] Commit: r3076: Merge from the sort branch.