Merge proposals dependent on lp://qastaging/~openstack-ubuntu-testing/charms/precise/cinder/trunk

lp://qastaging/~openstack-ubuntu-testing/charms/precise/cinder/trunk has no merge proposals.