Merge branch 'release-0.10'

Merge branch 'release-0.10'

Conflicts:
	Changelog
	README.Upgrade
	docs/collection_of_examples/configuration.rst
	docs/collection_of_examples/imageregister.rst
	docs/collection_of_examples/server.rst
	docs/commands.rst
	docs/conf.py
	docs/developers/clients-api.rst
	docs/setup.rst
	docs/usage.rst
	kamaki/cli/__init__.py
	kamaki/cli/command_shell.py
	kamaki/cli/commands/__init__.py
	kamaki/cli/commands/astakos.py
	kamaki/cli/commands/config.py
	kamaki/cli/commands/cyclades.py
	kamaki/cli/commands/history.py
	kamaki/cli/commands/image.py
	kamaki/cli/config.py
	kamaki/cli/one_command.py
	kamaki/cli/utils.py
	kamaki/clients/__init__.py
	kamaki/clients/astakos/test.py
	kamaki/clients/compute/__init__.py
	kamaki/clients/compute/test.py
	kamaki/clients/cyclades/__init__.py
	kamaki/clients/cyclades/test.py
	kamaki/clients/livetest/astakos.py
	kamaki/clients/livetest/cyclades.py
	version