Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1

Conflicts:

	src/mesa/pipe/Makefile

diff --cc src/mesa/pipe/Makefile
index e4b72e4,c0345a9..fbd36d9
--- 1/src/mesa/pipe/Makefile
--- 2/src/mesa/pipe/Makefile
+++ b/src/mesa/pipe/Makefile
@@@ -6,7 -6,7 +6,8 @@@ ifeq ($(CONFIG_NAME), linux-cell
  CELL_DIR = cell
  endif
  
- SUBDIRS = softpipe i915simple nv40 nv50 failover pipebuffer $(CELL_DIR)
 -SUBDIRS = softpipe i915simple i965simple failover pipebuffer $(CELL_DIR)
++SUBDIRS = softpipe i915simple i965simple nv40 nv50 failover \
++        pipebuffer $(CELL_DIR)
  
  
  default: subdirs