[smokeqt/f17: 14/14] Merge branch 'master' into f17

[Rex Dieter]

commit 344af34d687fba1b473bf2ce89a991f3c75450a2
Merge: 8cc09d3 2d0b319
Author: Rex Dieter <rdieter at fedoraproject.org>
Date:   Tue Sep 4 15:46:20 2012 -0500

    Merge branch 'master' into f17
    
    Conflicts:
    	.gitignore
    	smokeqt.spec
    	sources

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