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

[Rex Dieter]

commit aa5612f371cb98d4aacf0a60ddf311edfc9ce05a
Merge: 3e2d0f4 f001100
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Sat Sep 29 11:13:15 2012 -0500

    Merge branch 'master' into f17

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