[Fedora-spins] [spin-kickstarts/f19: 5/5] Merge remote-tracking branch 'origin/f19' into f19

[Bruno Wolff III]

commit 96833b75f97d270a6057771f1b4a9da636350a83
Merge: 69a35d1 19f6649
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Wed Jun 26 10:03:43 2013 -0500

    Merge remote-tracking branch 'origin/f19' into f19
    
    I needed to to a build that used ks files as of commit
    15305b2c82c04090452fdd86da1b38884f9010ec and a few commits
    added after that, but before I did the build needed to be
    added after changes I needed to do that build.

---