dfe4db7 Merge remote branch 'origin/f14/master' into f13/master

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