Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces
authorKeith Whitwell <keith@tungstengraphics.com>
Fri, 9 May 2008 12:11:48 +0000 (13:11 +0100)
committerKeith Whitwell <keith@tungstengraphics.com>
Fri, 9 May 2008 12:11:48 +0000 (13:11 +0100)

Trivial merge