trunk merge, getting fierce..
trunk merge, getting fierce..
openstack-attic/melange,rackerlabs/melange,rajarammallya/melange,rackerlabs/melange,rajarammallya/melange,rajarammallya/melange,rackerlabs/melange,openstack-attic/melange,openstack-attic/melange