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