[smokeqt/f16: 10/10] Merge remote-tracking branch 'origin/f17' into f16

[Rex Dieter]

commit 7fedf9ac47dcd3c30bd3a1bdb03fe22931fe010c
Merge: 45aca34 28b2339
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Wed Mar 7 17:34:09 2012 -0600

    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	smokeqt.spec
    	sources

 .gitignore   |    2 +-
 smokeqt.spec |   34 +++++++++++++++++++++++++++++-----
 sources      |    2 +-
 3 files changed, 31 insertions(+), 7 deletions(-)
---