Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
authorJouk <joukj@tarantella.(none)>
Wed, 25 Jul 2007 08:16:11 +0000 (10:16 +0200)
committerJouk <joukj@tarantella.(none)>
Wed, 25 Jul 2007 08:16:11 +0000 (10:16 +0200)

Trivial merge