From: Brian Paul <brianp@vmware.com>
Date: Fri, 8 Jan 2010 15:21:12 +0000 (-0700)
Subject: Merge branch 'mesa_7_7_branch'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fd70841121475d7aad98812d6bf9c9c67567b89a;p=mesa.git

Merge branch 'mesa_7_7_branch'

Conflicts:

	src/mesa/drivers/dri/i965/brw_wm_emit.c
---

fd70841121475d7aad98812d6bf9c9c67567b89a