Mesa (master): Merge branch 'master' into gallium-texture-transfer

[Michel Dänzer]

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

Author: Keith Whitwell <keithw at vmware.com>
Date:   Mon Feb 16 19:50:48 2009 +0000

Merge branch 'master' into gallium-texture-transfer

Conflicts:

	src/mesa/state_tracker/st_cb_accum.c
	src/mesa/state_tracker/st_cb_drawpixels.c

---