merge osm2pgsql:
bug fixes
shape processing support
bump