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

[Rex Dieter]

commit c414dea7b39d1c15860af1a16a5408e4db2e3f6e
Merge: bd1e8f6 e31d3a7
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Thu Jun 7 15:24:47 2012 -0500

    Merge branch 'f17' into f16

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