crowbar/barclamp-keystone — pull request #194 by vuntz (2014-03-13 07:49:39+00:00)
Title: Merge roxy branch into stoney

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