Mesa (master): Merge branch 'instanced-arrays'

[Michał Król]

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

Author: Michal Krol <michal at vmware.com>
Date:   Thu Jan 14 18:11:41 2010 +0100

Merge branch 'instanced-arrays'

Conflicts:
	src/gallium/drivers/softpipe/sp_draw_arrays.c

---