rebase from trunk
rebase from trunk
openstack-attic/melange,rajarammallya/melange,openstack-attic/melange,rajarammallya/melange,rajarammallya/melange,rackerlabs/melange,rackerlabs/melange,rackerlabs/melange,openstack-attic/melange