Mesa (llvm-context): Merge branch 'master' into llvm-context

[Brian Paul]

Module: Mesa
Branch: llvm-context
Commit: 52682e01f8097cd3f048fb1143f09a2298ea530a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=52682e01f8097cd3f048fb1143f09a2298ea530a

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Nov  1 10:33:49 2010 -0600

Merge branch 'master' into llvm-context

Conflicts:
	src/gallium/auxiliary/draw/draw_llvm.c
	src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline_llvm.c
	src/gallium/auxiliary/gallivm/lp_bld_arit.c
	src/gallium/auxiliary/gallivm/lp_bld_conv.c
	src/gallium/auxiliary/gallivm/lp_bld_flow.c
	src/gallium/auxiliary/gallivm/lp_bld_flow.h
	src/gallium/auxiliary/gallivm/lp_bld_init.c
	src/gallium/auxiliary/gallivm/lp_bld_init.h
	src/gallium/auxiliary/gallivm/lp_bld_logic.c
	src/gallium/auxiliary/gallivm/lp_bld_printf.c
	src/gallium/auxiliary/gallivm/lp_bld_quad.c
	src/gallium/auxiliary/gallivm/lp_bld_sample.c
	src/gallium/auxiliary/gallivm/lp_bld_sample_aos.c
	src/gallium/auxiliary/gallivm/lp_bld_sample_soa.c
	src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
	src/gallium/drivers/llvmpipe/lp_bld_depth.c
	src/gallium/drivers/llvmpipe/lp_bld_interp.c
	src/gallium/drivers/llvmpipe/lp_bld_interp.h
	src/gallium/drivers/llvmpipe/lp_context.c
	src/gallium/drivers/llvmpipe/lp_context.h
	src/gallium/drivers/llvmpipe/lp_jit.c
	src/gallium/drivers/llvmpipe/lp_state_fs.c
	src/gallium/drivers/llvmpipe/lp_test_round.c
	src/gallium/drivers/llvmpipe/lp_test_sincos.c

---