Merge branch 'origin' into glsl-compiler-1

Conflicts:

	src/mesa/main/context.c

diff --cc src/mesa/drivers/dri/nouveau/nouveau_context.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_fragprog.c
Simple merge

diff --cc src/mesa/drivers/dri/r300/r300_state.c
Simple merge

diff --cc src/mesa/main/context.c
Simple merge

diff --cc src/mesa/main/mtypes.h
Simple merge

diff --cc src/mesa/shader/arbprogparse.c
index 7d34bfbc8087df17bc174aa768bc60da6637f900,c6ea5c4f97384b73431eb7cd8cd09257035a3ed8..5027264f031e81a866b4e4083eb6547cedf4b144
--- 1/src/mesa/shader/arbprogparse.c
--- 2/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@@ -3861,8 -4036,9 +3861,9 @@@ _mesa_parse_arb_fragment_program(GLcont
     program->Base.InputsRead      = ap.Base.InputsRead;
     program->Base.OutputsWritten  = ap.Base.OutputsWritten;
     for (i = 0; i < MAX_TEXTURE_IMAGE_UNITS; i++)
 -      program->TexturesUsed[i] = ap.TexturesUsed[i];
 +      program->Base.TexturesUsed[i] = ap.TexturesUsed[i];
     program->FogOption          = ap.FogOption;
+    program->UsesKill          = ap.UsesKill;
  
     if (program->Base.Instructions)
        _mesa_free(program->Base.Instructions);

diff --cc src/mesa/swrast/s_readpix.c
Simple merge

diff --cc src/mesa/vbo/vbo_save_draw.c
Simple merge