Merge branch 'f19'

Conflicts:
	cloud-init.spec
This commit is contained in:
Garrett Holmstrom 2013-09-24 17:47:59 -07:00
commit 666e7e6072

Diff Content Not Available