From: Eric Anholt <eric@anholt.net>
Date: Mon, 11 Dec 2006 18:50:25 +0000 (-0800)
Subject: Merge branch 'origin' into crestline
X-Git-Tag: android-x86-1.6~2211^2~34
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d214138910218a24e8ae427d5ec6ff886dcb98a8;p=android-x86%2Fexternal-mesa.git

Merge branch 'origin' into crestline
---

d214138910218a24e8ae427d5ec6ff886dcb98a8