Mesa (mesa_7_6_branch): Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[Brian Paul]

Module: Mesa
Branch: mesa_7_6_branch
Commit: 6559eaef59526a7f4b2c22927637091018535c0c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6559eaef59526a7f4b2c22927637091018535c0c

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Sep 21 14:49:46 2009 -0600

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

---