Merge branch 'nouveau-1' of git+ssh://git.freedesktop.org/git/mesa/drm into nouveau-1
authorBen Skeggs <darktama@iinet.net.au>
Mon, 13 Nov 2006 17:52:08 +0000 (04:52 +1100)
committerBen Skeggs <darktama@iinet.net.au>
Mon, 13 Nov 2006 17:52:08 +0000 (04:52 +1100)

Trivial merge