[mkgmap-dev] Commit: r807: Re-work my patch to fit in with Roberts intention on how it should work.