Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1

diff --combined configs/linux-dri
index bf7881937e457e2b426b0b0a34a14a1f91eed3b4,cd82c571c7d0c57b84ea2673a1e55b0be5f87c1b..4fdef196d968eac6c5a36f73e1a797643634ea24
--- 1/configs/linux-dri
--- 2/configs/linux-dri
+++ b/configs/linux-dri
@@@ -59,10 -59,12 +59,12 @@@ SRC_DIRS := egl $(SRC_DIRS
  PROGRAM_DIRS = egl
  endif
  
+ 
+ 
  DRIVER_DIRS = dri
- WINDOW_SYSTEM=dri
+ WINDOW_SYSTEM = dri
  GALLIUM_WINSYS_DIRS = dri
  
  # gamma are missing because they have not been converted to use the new
  # interface.
 -DRI_DIRS = intel 
 +DRI_DIRS = nouveau