[mkgmap-dev] Commit: r2272: Fixed the things that went wrong during the last merge (hopefully)