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

[Rex Dieter]

commit bd1e8f6fed108c685d391d5320f2fd6d6614bf28
Merge: ca5591f 84e5c07
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Mon Apr 30 14:05:56 2012 -0500

    Merge branch 'master' into f16

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