Merge proposals dependent on lp://qastaging/~zulcss/cinder/2013.2

lp://qastaging/~zulcss/cinder/2013.2 has no merge proposals.