Mesa (master): Merge branch '7.8'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Apr 28 10:10:51 2010 -0600

Merge branch '7.8'

Conflicts:

	src/mesa/state_tracker/st_gen_mipmap.c

---