Merge branch 'master' of git+ssh://pmandin@git.freedesktop.org/git/mesa/drm
authorPatrice Mandin <pmandin@caramail.com>
Thu, 2 Aug 2007 18:08:05 +0000 (20:08 +0200)
committerPatrice Mandin <pmandin@caramail.com>
Thu, 2 Aug 2007 18:08:05 +0000 (20:08 +0200)

Trivial merge