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

diff --cc configs/default
index c1bc5fb01d09252a5a9a7ac4f069333dbc8bb74e,ef9c5fda1eba59dc1e0717cc7bf769e1fe5a1e79..8c6ae8484066401cb5b9cf3c5f436ac776e5d195
--- 1/configs/default
--- 2/configs/default
+++ b/configs/default
@@@ -68,9 -68,9 +68,9 @@@ PROGRAM_DIRS = demos redbook samples gl
  
  
  # Gallium directories and 
- GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate rtasm util
+ GALLIUM_AUXILIARY_DIRS = draw translate cso_cache pipebuffer tgsi sct rtasm util
  GALLIUM_AUXILIARIES = $(foreach DIR,$(GALLIUM_AUXILIARY_DIRS),$(TOP)/src/gallium/auxiliary/$(DIR)/lib$(DIR).a)
 -GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple failover
 +GALLIUM_DRIVER_DIRS = softpipe i915simple i965simple nv04 nv10 nv30 nv40 nv50 failover
  GALLIUM_WINSYS_COMMON_DIRS =
  GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVER_DIRS),$(TOP)/src/gallium/drivers/$(DIR)/lib$(DIR).a)
  GALLIUM_WINSYS_DIRS = xlib egl_xlib

diff --cc configs/linux-dri
Simple merge