Merge branch 'mesa_7_5_branch'

Conflicts:

	src/mesa/main/context.c

diff --cc src/mesa/main/context.c
index ad47e22580b3e9a5396f482353fd6e301005e5fd,a947f69632f308b67fe05af42afb5ab0213b8bc4..bf53bd34678e2717b05475ab6ea0661c87a8d57b
--- 1/src/mesa/main/context.c
--- 2/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@@ -1011,6 -1007,20 +1011,16 @@@ _mesa_free_context_data( GLcontext *ct
  
     _mesa_delete_array_object(ctx, ctx->Array.DefaultArrayObj);
  
 -#if FEATURE_ARB_vertex_buffer_object
 -   _mesa_delete_buffer_object(ctx, ctx->Array.NullBufferObj);
 -#endif
 -
+ #if FEATURE_ARB_pixel_buffer_object
+    _mesa_reference_buffer_object(ctx, &ctx->Pack.BufferObj, NULL);
+    _mesa_reference_buffer_object(ctx, &ctx->Unpack.BufferObj, NULL);
+ #endif
+ 
+ #if FEATURE_ARB_vertex_buffer_object
+    _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);
+    _mesa_reference_buffer_object(ctx, &ctx->Array.ElementArrayBufferObj, NULL);
+ #endif
+ 
     /* free dispatch tables */
     _mesa_free(ctx->Exec);
     _mesa_free(ctx->Save);