Merge branch 'mesa_7_6_branch' into mesa_7_7_branch

Conflicts:
	configure.ac
	progs/demos/morph3d.c
	progs/demos/textures.c
	progs/glsl/shtest.c
	progs/glsl/texaaline.c
	progs/tests/packedpixels.c
	progs/xdemos/corender.c
	src/mesa/main/version.h

diff --cc progs/tests/packedpixels.c
index c8884bb79f1da48897eb6314fd9f43a99f689f4e,1a9c2fedf0117bf3437bf3964f45a897e1638636..1e70a31151a60118970b4e2efe94c2f1096876ed
--- 1/progs/tests/packedpixels.c
--- 2/progs/tests/packedpixels.c
+++ b/progs/tests/packedpixels.c
@@@ -273,7 -253,7 +273,8 @@@ Draw(void
     glTranslatef(2, (i + 1) * (h + 2), 0);
     glRasterPos2i(8, 6);
     sprintf(s, "Internal Texture Format [f/F]: %s (%d of %lu)",
 +           IntFormats[CurFormat].name, CurFormat + 1, NUM_INT_FORMATS);
+            IntFormats[CurFormat].name, CurFormat + 1, (unsigned long) NUM_INT_FORMATS);
     PrintString(s);
     glPopMatrix();
  

diff --cc src/mesa/drivers/dri/r600/r700_state.c
Simple merge

diff --cc src/mesa/shader/slang/slang_compile.c
Simple merge

diff --cc src/mesa/state_tracker/st_gen_mipmap.c
Simple merge