b78e777 Merge remote-tracking branch 'origin/f15/master' into f14/master

Merged and Committed by rdieter 13 years ago
    Merge remote-tracking branch 'origin/f15/master' into f14/master
    
    Conflicts:
    	.gitignore
    	oxygen-icon-theme.spec
    	sources
    
        
file modified
+1 -1
file modified
+23 -12
file modified
+1 -1