commit 666e7e60729b35e7cadf9a90bd2e0cc867105aae Merge: d15a872 ce5c59c Author: Garrett Holmstrom <gholms at fedoraproject.org> Date: Tue Sep 24 17:47:59 2013 -0700 Merge branch 'f19' Conflicts: cloud-init.spec ---