Mesa (master): Merge branch 'mesa_7_6_branch'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Oct  8 09:28:07 2009 -0600

Merge branch 'mesa_7_6_branch'

Conflicts:

	src/mesa/drivers/common/meta.c

---