Merge lp://staging/~jaypipes/glance/d3-proposed into lp://staging/~hudson-openstack/glance/milestone-proposed

etc/glance-api.conf (+2/-0)
glance/api/v1/images.py (+14/-10)
glance/common/client.py (+6/-0)
glance/store/__init__.py (+13/-10)
glance/store/filesystem.py (+3/-2)
glance/store/s3.py (+12/-0)
glance/store/swift.py (+47/-7)
run_tests.sh (+28/-10)
tests/functional/test_scrubber.py (+20/-4)
tests/unit/test_store_location.py (+40/-3)
tests/unit/test_swift_store.py (+6/-1)
tools/pip-requires (+1/-1)