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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Sep 24 10:52:15 2009 -0600

Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

---