From: Brian Paul <brianp@vmware.com>
Date: Tue, 6 Jan 2009 15:15:54 +0000 (-0700)
Subject: Merge commit 'origin/master' into gallium-0.2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=374cf77b2f0f13f9380fb0c9d804222a83bdc2e0;p=mesa.git

Merge commit 'origin/master' into gallium-0.2

Conflicts:

	src/mesa/drivers/dri/common/dri_util.c
---

374cf77b2f0f13f9380fb0c9d804222a83bdc2e0