merged with r555
merged with r555

rajarammallya/melange,rackerlabs/melange,rackerlabs/melange,rackerlabs/melange,rajarammallya/melange,openstack-attic/melange,openstack-attic/melange,rajarammallya/melange,openstack-attic/melange