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

[Rex Dieter]

commit 665bf11faf3437d5e59214b0f66a42e2ef5a5d4b
Merge: 22a1860 5ae7290
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 13:04:14 2012 -0500

    Merge branch 'f17' into f16

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