Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/shader/shader_api.c
This commit is contained in:
Keith Whitwell 2008-09-23 17:40:49 -07:00
commit 2a7dc79273

Diff content is not available