From: Christian König <deathsimple@vodafone.de>
Date: Tue, 11 Jan 2011 23:51:45 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into pipe-video
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e755c7bec3bc722ee451bdaed8da741f337d33b3;p=mesa.git

Merge remote branch 'origin/master' into pipe-video

Conflicts:
	src/gallium/drivers/r600/r600_shader.c
---

e755c7bec3bc722ee451bdaed8da741f337d33b3