Merge commit 'origin/master' into gallium-0.2

diff --cc configs/default
Simple merge

diff --cc progs/glsl/.gitignore
index d5d9d915b64f8a6a803f508838f6729c8e658b68,21c41da0cd59d3fbd42a91fedd0eaaf74a94ab35..5d954519b24598bd9609b383169c7b2a072cbc46
--- 1/progs/glsl/.gitignore
--- 2/progs/glsl/.gitignore
+++ b/progs/glsl/.gitignore
@@@ -1,15 -1,12 +1,16 @@@
  bitmap
  brick
  bump
 +convolutions
  deriv
  extfuncs.h
 +fragcoord
 +identity
  mandelbrot
+ multinoise
  multitex
  noise
 +pointcoord
  points
  readtex.c
  readtex.h

diff --cc progs/glsl/Makefile
index 488a4e99513ac977518718d31146cd0082f24890,856de91c905cc43749cc8951e4bd58662f64c8ff..71ca0af941235214b2832aef7473e0ccba51f2b7
--- 1/progs/glsl/Makefile
--- 2/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -15,9 -15,9 +15,10 @@@ PROGS = 
        bump \
        convolutions \
        deriv \
 +      identity \
        fragcoord \
        mandelbrot \
+       multinoise \
        multitex \
        noise \
        points \

diff --cc src/glut/glx/Makefile
Simple merge

diff --cc src/glut/mini/Makefile
Simple merge

diff --cc src/glw/Makefile
Simple merge

diff --cc src/glx/x11/indirect.c
Simple merge

diff --cc src/mesa/Makefile
Simple merge