871455c Merge branch 'master' into f15

Merged and Committed by Christopher Aillon 10 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	gnome-desktop.spec
    
        
file modified
+6 -5