[mkgmap-dev] Commit: r897: Preparing for merge with some smoke tests.