Joshua Harlow 245f32f480 Temporarily patch around lp:1090592
Conflicts:
	conf/components/glance.yaml
	conf/components/keystone-client.yaml
2013-01-02 11:18:06 -08:00
..
2012-11-09 17:06:12 -08:00
2012-11-09 17:06:20 -08:00