Merge branch 'master' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Sun, 21 Sep 2008 17:49:38 +0000 (10:49 -0700)
committerKeith Whitwell <keith@tungstengraphics.com>
Sun, 21 Sep 2008 17:49:38 +0000 (10:49 -0700)

Trivial merge