Merge remote branch 'upstream/gallium-0.2' into nouveau-gallium-0.2
authorBen Skeggs <skeggsb@gmail.com>
Fri, 12 Sep 2008 12:53:44 +0000 (22:53 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Fri, 12 Sep 2008 12:53:44 +0000 (22:53 +1000)
1  2 
configs/default

diff --cc configs/default
Simple merge