ec78140 Merge remote-tracking branch 'origin/f17' into f16

Merged and Committed by rdieter 12 years ago
    Merge remote-tracking branch 'origin/f17' into f16
    
    Conflicts:
    	.gitignore
    	kdemultimedia.spec
    	sources
    
        
file modified
+1 -3
file modified
+32 -20
file modified
+1 -1