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

[Rex Dieter]

commit ca5591f469cc658145d77fb8c6de872d48ec44be
Merge: 7fedf9a 784915d
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Fri Mar 30 11:32:48 2012 -0500

    Merge branch 'master' into f16

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