fee1836 Merge branch 'master' into f15

Merged and Committed by Peter Hutterer 13 years ago
    Merge branch 'master' into f15
    
    Conflicts:
    	xorg-x11-drv-synaptics.spec
    
        
file modified
+2 -0
file modified
+1 -1
file modified
+8 -2