Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
authorjoukj <joukj@tarantella.(none)>
Fri, 30 Nov 2007 10:12:41 +0000 (11:12 +0100)
committerjoukj <joukj@tarantella.(none)>
Fri, 30 Nov 2007 10:12:41 +0000 (11:12 +0100)

Trivial merge