befc165 Merge branch 'master' into f16

Merged and Committed by ajax 12 years ago
    Merge branch 'master' into f16
    
    Conflicts:
    	xorg-x11-drv-ati.spec
    
        
file modified
+6 -3