Mesa (gallium-mesa-7.4): Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4

[Alan Hourihane]

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

Author: Alan Hourihane <alanh at vmware.com>
Date:   Fri Apr 17 01:34:32 2009 +0100

Merge commit 'origin/mesa_7_4_branch' into gallium-mesa-7.4

Conflicts:
	Makefile

---