Merge commit 'origin/draw-vbuf-interface'

diff --cc src/gallium/auxiliary/draw/draw_pipe_vbuf.c
Simple merge

diff --cc src/gallium/drivers/i915simple/i915_prim_vbuf.c
Simple merge

diff --cc src/gallium/drivers/nv04/nv04_prim_vbuf.c
Simple merge

diff --cc src/gallium/drivers/nv10/nv10_prim_vbuf.c
Simple merge

diff --cc src/gallium/drivers/nv20/nv20_prim_vbuf.c
Simple merge