Merge branch 'nouveau-1' of git+ssh://marcheu@git.freedesktop.org/git/mesa/drm into...
authorStephane Marchesin <marchesin@icps.u-strasbg.fr>
Tue, 21 Nov 2006 22:32:58 +0000 (23:32 +0100)
committerStephane Marchesin <marchesin@icps.u-strasbg.fr>
Tue, 21 Nov 2006 22:32:58 +0000 (23:32 +0100)

Trivial merge