8c3e2a8 Merge branch 'f19' into f20

Merged and Committed by Peter Hutterer 10 years ago
    Merge branch 'f19' into f20
    
    Conflicts:
    	xorg-x11-server.spec
    
        
file modified
+7 -1