3653e8a Merge remote branch 'origin/master' into f14/master

Merged and Committed by rdieter 13 years ago
    Merge remote branch 'origin/master' into f14/master
    
    Conflicts:
    	phonon.spec
    
        
file modified
+8 -9
file modified
+18 -5
file modified
+5 -3
file modified
+1 -1