Mesa (master): Merge branch '7.8'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Apr 22 11:10:19 2010 -0600

Merge branch '7.8'

Conflicts:

	src/mesa/state_tracker/st_format.c

---