Rebased to trunk rev 1035.
Rebased to trunk rev 1035.
rajarammallya/melange,rackerlabs/melange,openstack-attic/melange,rajarammallya/melange,openstack-attic/melange,rackerlabs/melange,openstack-attic/melange,rajarammallya/melange,rackerlabs/melange