Merge branch 'master' into py3kport

Conflicts:
	.gitignore
	boto/__init__.py
	boto/cloudsearch/search.py
	boto/connection.py
	boto/utils.py
	setup.py
	tests/integration/s3/test_key.py
	tests/unit/sqs/test_connection.py