Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
authorJouk <joukj@tarantella.nano.tudelft.nl>
Wed, 31 Oct 2007 07:18:58 +0000 (08:18 +0100)
committerJouk <joukj@tarantella.nano.tudelft.nl>
Wed, 31 Oct 2007 07:18:58 +0000 (08:18 +0100)

Trivial merge