[smokegen/f16: 2/2] Merge branch 'master' into f16

[Rex Dieter]

commit fd410a0e96a125c2fa1412eef80816b817c3ee75
Merge: 93568c2 a780ff1
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 10:56:27 2012 -0500

    Merge branch 'master' into f16

 .gitignore    |    1 +
 smokegen.spec |    5 ++++-
 sources       |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)
---