Merge commit 'origin/gallium-0.2' into gallium-master-merge
authorBrian Paul <brianp@vmware.com>
Tue, 10 Feb 2009 23:34:51 +0000 (16:34 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 10 Feb 2009 23:34:51 +0000 (16:34 -0700)

Trivial merge