From: Brian Paul <brianp@vmware.com>
Date: Tue, 22 Sep 2009 19:44:43 +0000 (-0600)
Subject: Merge branch 'mesa_7_5_branch' into mesa_7_6_branch
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ba002eb1965ccdb09d7c3657d32e22e71ed4096a;p=mesa.git

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

Conflicts:

	src/mesa/main/bufferobj.c
---

ba002eb1965ccdb09d7c3657d32e22e71ed4096a