[mkgmap-dev] Commit: r2470: Merge the 'functions' branch.