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