[mkgmap-dev] Commit: r2468: Merge from the numbering branch.