a60ac6d Merge branch 'f14'

Merged and Committed by ajax 13 years ago
    Merge branch 'f14'
    
    Conflicts:
    	xorg-x11-server.spec
    
    Signed-off-by: Adam Jackson <ajax@redhat.com>
    
        
file modified
+5 -1