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

Author: Alan Hourihane <alanh at vmware.com>
Date:   Fri Apr 24 17:23:38 2009 +0100

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

---