[mkgmap-dev] Commit: r1085: Merge in smaller_img branch.