merging parent branch lp:~rackspace-titan/nova/openstack-api-version-split
merging parent branch lp:~rackspace-titan/nova/openstack-api-version-split
rackerlabs/melange,rajarammallya/melange,openstack-attic/melange,openstack-attic/melange,rajarammallya/melange,openstack-attic/melange,rajarammallya/melange,rackerlabs/melange,rackerlabs/melange