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

[Rex Dieter]

commit 22a186001885d45efbccb7a6bc26d6743201a71d
Merge: fd410a0 8227d49
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 13:09:52 2012 -0500

    Merge branch 'master' into f16

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