Mesa (master): Merge branch 'mesa_7_6_branch'

[Brian Paul]

Module: Mesa
Branch: master
Commit: 8fda97afb8b7a03415dbca6d83691d2d6461126c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fda97afb8b7a03415dbca6d83691d2d6461126c

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Sep 28 10:02:20 2009 -0600

Merge branch 'mesa_7_6_branch'

---