Mesa (master): Merge branch 'mesa_7_6_branch'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Wed Nov  4 17:57:20 2009 -0700

Merge branch 'mesa_7_6_branch'

Conflicts:

	src/mesa/drivers/windows/gdi/mesa.def

---