Mesa (master): Merge branch 'mesa_7_7_branch'

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Jan 22 16:09:03 2010 -0700

Merge branch 'mesa_7_7_branch'

Conflicts:

	src/mesa/shader/prog_execute.c

---