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