Merge branch 'mesa_7_5_branch'

Conflicts:
	src/mesa/main/dlist.c
	src/mesa/vbo/vbo_save_api.c

diff --cc progs/tests/.gitignore
index 917c4f3e8d2b41a6190443b1c3544aaef5a93197,7c6c245d394ab4b08ee6078b228082b22dad55d0..3479ff8b33bceb7f0ee77393761cb9a3c8a89e80
--- 1/progs/tests/.gitignore
--- 2/progs/tests/.gitignore
+++ b/progs/tests/.gitignore
@@@ -57,8 -54,8 +57,9 @@@ mipmap_vie
  multipal
  no_s3tc
  packedpixels
 +persp_hint
  pbo
+ prim
  prog_parameter
  quads
  random

diff --cc progs/tests/Makefile
Simple merge

diff --cc progs/tests/SConscript
Simple merge

diff --cc src/gallium/drivers/softpipe/sp_setup.c
Simple merge

diff --cc src/mesa/drivers/dri/intel/intel_fbo.c
Simple merge

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

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

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

diff --cc src/mesa/shader/arbprogparse.c
Simple merge

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

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

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

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

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