Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/main/arrayobj.c
	src/mesa/main/arrayobj.h
	src/mesa/main/context.c

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

diff --cc src/mesa/drivers/dri/intel/intel_context.h
Simple merge

diff --cc src/mesa/main/arrayobj.h
index 9c2f340cfae1b741fac4921b74c7753b1b79dd26,9c4036af5a7ca613fd778dabf96d6036aa528c52..90c2aea1555c430214a39950254160c96e6d7e7c
--- 1/src/mesa/main/arrayobj.h
--- 2/src/mesa/main/arrayobj.h
+++ b/src/mesa/main/arrayobj.h
@@@ -56,7 -56,14 +56,8 @@@ extern voi
  _mesa_initialize_array_object( GLcontext *ctx,
                                 struct gl_array_object *obj, GLuint name );
  
 -extern void
 -_mesa_save_array_object( GLcontext *ctx, struct gl_array_object *obj );
 -
 -extern void
 -_mesa_remove_array_object( GLcontext *ctx, struct gl_array_object *obj );
 -
  
+ 
  /*
   * API functions
   */