Mesa (master): Merge branch '7.8'

[Dan Nicholson]

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

Author: Dan Nicholson <dbn.lists at gmail.com>
Date:   Mon Apr 19 20:22:48 2010 -0700

Merge branch '7.8'

Conflicts:
	progs/egl/Makefile

progs/egl/Makefile is gone on master with the egl demos split into
subdirectories. Will require an additional commit.

---