Mesa (master): Merge branch 'master' into r300-compiler

[Nicolai Hähnle]

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

Author: Nicolai Hähnle <nhaehnle at gmail.com>
Date:   Sun Sep  6 13:15:04 2009 +0200

Merge branch 'master' into r300-compiler

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

---