crowbar/barclamp-cinder — pull request #158 by vuntz (2014-03-13 08:10:36+00:00)
Title: Merge roxy branch into stoney

I did a merge instead of cherry-picking commits. I can cherry-pick if preferred.