[mkgmap-dev] Commit: r3605: merge the housenumber2 branch