Merge branch 'master' of git+ssh://aapot@git.freedesktop.org/git/mesa/mesa
authorAapo Tahkola <aapo@aapo-desktop.(none)>
Sun, 6 May 2007 16:19:16 +0000 (19:19 +0300)
committerAapo Tahkola <aapo@aapo-desktop.(none)>
Sun, 6 May 2007 16:19:16 +0000 (19:19 +0300)

Trivial merge