Merge proposals dependent on lp://qastaging/~tvansteenburgh/charms/precise/block-storage-broker/fix-tests

lp://qastaging/~tvansteenburgh/charms/precise/block-storage-broker/fix-tests has no merge proposals.