Mesa (master): Merge branch 'width0'

[Roland Scheidegger]

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

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Fri Nov 27 17:15:47 2009 +0100

Merge branch 'width0'

Conflicts:
	src/gallium/drivers/r300/r300_texture.c
	src/gallium/state_trackers/xorg/xorg_exa.c
	src/mesa/state_tracker/st_cb_texture.c

---