Mesa (master): Merge branch 'gallium-noconstbuf'

[Roland Scheidegger]

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

Author: Roland Scheidegger <sroland at vmware.com>
Date:   Fri Jan 15 18:09:45 2010 +0100

Merge branch 'gallium-noconstbuf'

Conflicts:
	src/gallium/drivers/softpipe/sp_draw_arrays.c
	src/mesa/state_tracker/st_draw_feedback.c

---