3f8b872 Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/xorg-x11-server into f14

Merged and Committed by mcepl 13 years ago
    Merge branch 'f14/master' of ssh://pkgs.fedoraproject.org/xorg-x11-server into f14
    
        
file modified
+8 -2