Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
authorJeremy Kolb <jkolb@brandeis.edu>
Mon, 22 Jan 2007 01:47:10 +0000 (20:47 -0500)
committerJeremy Kolb <jkolb@brandeis.edu>
Mon, 22 Jan 2007 01:47:10 +0000 (20:47 -0500)

Trivial merge