45a5a11 Merge branch 'master' into f16

Merged and Committed by rdieter 9 years ago
    Merge branch 'master' into f16
    
    Conflicts:
    	qt.spec
    
        
file modified
+14 -3