[mkgmap-dev] Commit: r3294: Merge the unicode branch.