setup.py
Merge branch 'master' of github.com:rory/python-osm