From: Christian König <deathsimple@vodafone.de>
Date: Fri, 21 Jan 2011 20:51:24 +0000 (+0100)
Subject: Merge remote branch 'origin/master' into pipe-video
X-Git-Tag: 062012170305~4979^2~238
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=86e5b79a274ad4ed5c169aa5626106331273311c;p=profile%2Fivi%2Fmesa.git

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

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

86e5b79a274ad4ed5c169aa5626106331273311c