[mkgmap-dev] Commit: r3080: Merge assertion fix from sort branch.