[Merge] lp:~corey.bryant/glance/2013.1.5 into lp:~ubuntu-server-dev/glance/grizzly

[James Page]

Review: Disapprove

I still think we should not ship this; the upstream changes are reverted by the patch I applied so its just going to consume build cycles IMHO.
-- 
https://code.launchpad.net/~corey.bryant/glance/2013.1.5/+merge/212423
Your team Ubuntu Server Developers is subscribed to branch lp:~ubuntu-server-dev/glance/grizzly.