Mesa (master): Merge branch '7.8'

[Brian Paul]

Module: Mesa
Branch: master
Commit: 1fa7789e828d1005e2473fc7cd364bd45eb30843
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1fa7789e828d1005e2473fc7cd364bd45eb30843

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Apr 28 07:21:25 2010 -0600

Merge branch '7.8'

Conflicts:

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

---