merged trunk again
merged trunk again
openstack-attic/melange,openstack-attic/melange,rackerlabs/melange,rackerlabs/melange,openstack-attic/melange,rajarammallya/melange,rajarammallya/melange,rajarammallya/melange,rackerlabs/melange