[mkgmap-dev] Commit: r2461: Merge the mkgmap_exits branch