Mesa (master): Merge branch 'master' into gallium-new-formats

[Roland Scheidegger]

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

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Tue Mar 30 01:52:13 2010 +0200

Merge branch 'master' into gallium-new-formats

Conflicts:
	src/gallium/auxiliary/util/u_format.csv

---