merged trunk, fixed a couple errors
merged trunk, fixed a couple errors
rajarammallya/melange,rackerlabs/melange,openstack-attic/melange,rackerlabs/melange,openstack-attic/melange,rackerlabs/melange,rajarammallya/melange,openstack-attic/melange,rajarammallya/melange