merge with trunk, resolve conflicts
merge with trunk, resolve conflicts
rajarammallya/melange,rajarammallya/melange,rackerlabs/melange,openstack-attic/melange,openstack-attic/melange,openstack-attic/melange,rackerlabs/melange,rackerlabs/melange,rajarammallya/melange