e130bcc Merge branch 'master' into f17

Merged and Committed by ajax 11 years ago
    Merge branch 'master' into f17
    
    Conflicts:
    	xorg-x11-drv-intel.spec
    
        
file modified
+4 -0
file removed
-151
file modified
+1 -1
file modified
+29 -11