shp-to-osm was written specifically for this purpose. It won't handle any shapefile merging tasks but it will convert shapefiles to OSM format (including multipolygon relations) for you.
_______________________________________________ dev mailing list dev@openstreetmap.org http://lists.openstreetmap.org/listinfo/dev