The SVN repository contains a utiltity called shp2osm which you can use as a basis for your own tool for importing data. Regarding the license: please join the legal talk mailinglist and seek advice there before uploading data that has any kind of license. OSM is very strict in what data we accept in our database to prevent any future law suit.