merged with rev.1499
merged with rev.1499
openstack-attic/melange,rackerlabs/melange,openstack-attic/melange,rackerlabs/melange,rajarammallya/melange,openstack-attic/melange,rackerlabs/melange,rajarammallya/melange,rajarammallya/melange