Mesa (master): Merge branch 'master' into r300g-glsl

[Nicolai Hähnle]

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

Author: Nicolai Hähnle <nhaehnle at gmail.com>
Date:   Wed Oct  7 20:45:08 2009 +0200

Merge branch 'master' into r300g-glsl

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

Signed-off-by: Nicolai Hähnle <nhaehnle at gmail.com>

---