Comment 17 for bug 1349774

Change abandoned by Gregory Haynes (<email address hidden>) on branch: master
Review: https://review.openstack.org/110755