Merge commit 'origin/gallium-0.2' into gallium-0.2

Conflicts:

	src/gallium/state_trackers/wgl/icd/stw_icd.c

diff --cc src/gallium/state_trackers/wgl/icd/stw_icd.c
index 2cefc5c812c10d9a4d725c2c70f235f43e604a1e,8fa9f4e667f7027341495f5db730349440c2b714..e4f3c669e205a28f609fb8a298201239671569c1
--- 1/src/gallium/state_trackers/wgl/icd/stw_icd.c
--- 2/src/gallium/state_trackers/wgl/icd/stw_icd.c
+++ b/src/gallium/state_trackers/wgl/icd/stw_icd.c
@@@ -101,7 -89,10 +101,10 @@@ lookup_context( struct stw_icd *icd
         dhglrc >= DRV_CONTEXT_MAX)
        return NULL;
  
 -   if(!stw_icd)
++   if (icd == NULL)
+       return NULL;
+ 
 -   return stw_icd->ctx_array[dhglrc - 1].ctx;
 +   return icd->ctx_array[dhglrc - 1].ctx;
  }
  
  BOOL APIENTRY