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