Mesa (master): Merge remote branch 'origin/7.8'

[Dave Airlie]

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

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Apr  8 16:48:41 2010 +1000

Merge remote branch 'origin/7.8'

Conflicts:
	Makefile
	configs/default
	src/mesa/main/version.h

---