7ef2687 Backport 5a4e42f3 and d42d7918 to fix DRI2 and XKB, respectively.

Authored and Committed by ajax 11 years ago
    Backport 5a4e42f3 and d42d7918 to fix DRI2 and XKB, respectively.
    
        
file modified
+9 -1