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: fc41ecebeb7f277861d234815020b0407504a70d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=fc41ecebeb7f277861d234815020b0407504a70d

Author: Alan Hourihane <alanh at vmware.com>
Date:   Thu Mar 26 17:35:48 2009 +0000

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

Conflicts:
	progs/xdemos/Makefile

---