From: Keith Whitwell <keith@tungstengraphics.com>
Date: Wed, 24 Sep 2008 00:40:49 +0000 (-0700)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Tag: 062012170305~17580^2~496^2~636
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2a7dc7927339322fbffaba62d2fb69373b94caf0;p=profile%2Fivi%2Fmesa.git

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/shader/shader_api.c
---

2a7dc7927339322fbffaba62d2fb69373b94caf0