Mesa (master): Merge commit 'origin/tgsi-simplify-ext'

[Keith Whitwell]

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

Author: Keith Whitwell <keithw at vmware.com>
Date:   Tue Dec  1 14:31:14 2009 +0000

Merge commit 'origin/tgsi-simplify-ext'

Conflicts:
	src/gallium/drivers/r300/r300_vs.c

---