Merge branch 'rackspace_production' of github.com:rackerlabs/swift into rackspace_production

Conflicts:
	debian/changelog
Merge branch 'rackspace_production' of github.com:rackerlabs/swift into rackspace_production

Conflicts:
	debian/changelog