Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
authorBen Skeggs <skeggsb@gmail.com>
Fri, 12 Sep 2008 10:33:59 +0000 (20:33 +1000)
committerBen Skeggs <skeggsb@gmail.com>
Fri, 12 Sep 2008 10:33:59 +0000 (20:33 +1000)
1  2 
configs/default

diff --cc configs/default
Simple merge