From: Brian Paul <brianp@vmware.com>
Date: Wed, 28 Apr 2010 13:21:25 +0000 (-0600)
Subject: Merge branch '7.8'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1fa7789e828d1005e2473fc7cd364bd45eb30843;p=mesa.git

Merge branch '7.8'

Conflicts:

	src/glx/dri2_glx.c
	src/glx/glx_pbuffer.c
---

1fa7789e828d1005e2473fc7cd364bd45eb30843