merge trunk
merge trunk

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