098f702 Merge branch 'f15'

Merged and Committed by tbzatek 13 years ago
    Merge branch 'f15'
    
    Conflicts:
    	.gitignore
    	gnome-icon-theme-extras.spec
    	sources
    
        
file modified
+1 -3
file modified
+5 -5
file modified
+1 -2