Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/drm
authorJeremy Kolb <jkolb@brandeis.edu>
Thu, 1 Nov 2007 00:14:48 +0000 (20:14 -0400)
committerJeremy Kolb <jkolb@brandeis.edu>
Thu, 1 Nov 2007 00:14:48 +0000 (20:14 -0400)

Trivial merge