Merge branch 'mesa_7_5_branch'

Conflicts:

	Makefile
	src/mesa/main/version.h

diff --cc Makefile
Simple merge

diff --cc src/mesa/state_tracker/st_atom_framebuffer.c
index f23186c,5362936..4d897b6
--- 1/src/mesa/state_tracker/st_atom_framebuffer.c
--- 2/src/mesa/state_tracker/st_atom_framebuffer.c
+++ b/src/mesa/state_tracker/st_atom_framebuffer.c
@@@ -120,13 -118,19 +118,20 @@@ update_framebuffer_state( struct st_con
           }
  
           if (strb->surface) {
-             framebuffer->cbufs[framebuffer->nr_cbufs] = strb->surface;
+             pipe_surface_reference(&framebuffer->cbufs[framebuffer->nr_cbufs],
+                                    strb->surface);
              framebuffer->nr_cbufs++;
           }
 +         strb->defined = GL_TRUE; /* we'll be drawing something */
        }
     }
+    for (i = framebuffer->nr_cbufs; i < PIPE_MAX_COLOR_BUFS; i++) {
+       pipe_surface_reference(&framebuffer->cbufs[i], NULL);
+    }
  
+    /*
+     * Depth/Stencil renderbuffer/surface.
+     */
     strb = st_renderbuffer(fb->Attachment[BUFFER_DEPTH].Renderbuffer);
     if (strb) {
        strb = st_renderbuffer(strb->Base.Wrapped);