merged with trunk. All clear!
merged with trunk. All clear!

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