Merge branch 'master' of git+ssh://joukj@git.freedesktop.org/git/mesa/mesa
authorJouk <joukj@tarantella.nano.tudelft.nl>
Tue, 2 Oct 2007 13:17:23 +0000 (15:17 +0200)
committerJouk <joukj@tarantella.nano.tudelft.nl>
Tue, 2 Oct 2007 13:17:23 +0000 (15:17 +0200)

Trivial merge