5285948 Merge branch 'f18'

Merged and Committed by Cosimo Cecchi 11 years ago
    Merge branch 'f18'
    
    Conflicts:
    	gnome-themes-standard.spec
    	sources
    
        
file modified
+6 -0
file modified
+24 -4
file modified
+1 -1