Mesa (gallium-resources): Merge commit 'origin/master' into gallium-resources

[Keith Whitwell]

Module: Mesa
Branch: gallium-resources
Commit: eb56e64986790aa2fa35534ce652b78656b0c3c5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=eb56e64986790aa2fa35534ce652b78656b0c3c5

Author: Keith Whitwell <keithw at vmware.com>
Date:   Sat Apr 10 00:38:43 2010 +0100

Merge commit 'origin/master' into gallium-resources

Conflicts:
	src/gallium/drivers/r300/r300_texture.c

---