Mesa (master): Merge branch '7.8'

[Michel Dänzer]

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

Author: Michel Dänzer <daenzer at vmware.com>
Date:   Fri Mar 26 18:42:16 2010 +0100

Merge branch '7.8'

Conflicts:
	src/mesa/drivers/dri/intel/intel_mipmap_tree.c - left what was in master

---