Merge commit 'origin/master' into gallium-0.2
authorAlan Hourihane <alanh@tungstengraphics.com>
Fri, 12 Dec 2008 23:02:13 +0000 (23:02 +0000)
committerAlan Hourihane <alanh@tungstengraphics.com>
Fri, 12 Dec 2008 23:02:13 +0000 (23:02 +0000)

Trivial merge