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

[Rex Dieter]

commit 13e75568554b899452977669b0a2c2762ca3862e
Merge: 665bf11 d84a5ef
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Aug 2 08:37:31 2012 -0500

    Merge branch 'f17' into f16

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