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

Conflicts:

	configs/default

diff --cc configs/default
index 732ffeb16098ea44dddb517722cfb842d5bb42cb,2776a118057baf36381820ecb0eaec44501b5fac..a8d1fe6bec2f937fb0695cfe9b784c7607f90eac
--- 1/configs/default
--- 2/configs/default
+++ b/configs/default
@@@ -70,9 -70,10 +70,10 @@@ PROGRAM_DIRS = demos redbook samples gl
  # Gallium directories and 
  GALLIUM_AUXILIARY_DIRS = draw cso_cache pipebuffer tgsi sct translate 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 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
+ GALLIUM_WINSYS_DIRS = xlib egl_xlib
  
  
  # Library/program dependencies

diff --cc configs/linux-dri
Simple merge