--- Mesa-7.4/src/glx/x11/drisw_glx.c	2009-01-22 17:38:33.000000000 +0000
+++ Mesa-7.4/src/glx/x11/drisw_glx.c.fixed	2009-04-03 23:25:17.000000000 +0100
@@ -405,6 +405,8 @@
    psp->createContext = driCreateContext;
    psp->createDrawable = driCreateDrawable;
    psp->swapBuffers = driSwapBuffers;
+   psp->waitX = NULL;
+   psp->waitGL = NULL;
 
    return psp;