Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
authorJouk <joukj@tarantella.(none)>
Fri, 8 Jun 2007 11:38:24 +0000 (13:38 +0200)
committerJouk <joukj@tarantella.(none)>
Fri, 8 Jun 2007 11:38:24 +0000 (13:38 +0200)

Trivial merge