Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Tue, 25 Nov 2008 09:28:36 +0000 (09:28 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Tue, 25 Nov 2008 09:28:36 +0000 (09:28 +0000)

Trivial merge