Mesa (master): Merge remote branch 'origin/master' into lp-setup-llvm

[Keith Whitwell]

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

Author: Keith Whitwell <keithw at vmware.com>
Date:   Sun Oct 17 19:03:42 2010 -0700

Merge remote branch 'origin/master' into lp-setup-llvm

Conflicts:
	src/gallium/drivers/llvmpipe/lp_setup_coef.c
	src/gallium/drivers/llvmpipe/lp_setup_coef.h
	src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
	src/gallium/drivers/llvmpipe/lp_setup_point.c
	src/gallium/drivers/llvmpipe/lp_setup_tri.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.h

---