Merge commit 'origin/master' into gallium-0.2
authorKeith Whitwell <keith@tungstengraphics.com>
Tue, 23 Sep 2008 22:53:29 +0000 (15:53 -0700)
committerKeith Whitwell <keith@tungstengraphics.com>
Tue, 23 Sep 2008 22:53:29 +0000 (15:53 -0700)

Trivial merge