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

[Nicolai Hähnle]

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

Author: Nicolai Hähnle <nhaehnle at gmail.com>
Date:   Mon Sep 21 13:26:50 2009 +0200

Merge branch 'master' into r300-compiler

There were additional non-textual conflicts.

Conflicts:
	src/gallium/drivers/r300/r300_tgsi_to_rc.c
	src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c
	src/mesa/drivers/dri/r300/compiler/radeon_program.c
	src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c

---