Mesa (softpipe-opt): Merge branch 'tex-tilecache' into softpipe-opt

[Keith Whitwell]

Module: Mesa
Branch: softpipe-opt
Commit: 7670102468a55de50cf0cfa0b938d36aaf212f1f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=7670102468a55de50cf0cfa0b938d36aaf212f1f

Author: Keith Whitwell <keithw at vmware.com>
Date:   Sun Aug 23 10:23:46 2009 +0100

Merge branch 'tex-tilecache' into softpipe-opt

Conflicts:
	src/gallium/drivers/softpipe/sp_state_derived.c
	src/gallium/drivers/softpipe/sp_state_sampler.c
	src/gallium/drivers/softpipe/sp_tex_sample.c
	src/gallium/drivers/softpipe/sp_tex_sample.h
	src/gallium/drivers/softpipe/sp_tile_cache.c

---