Merge branch 'nouveau-import'
authorDave Airlie <airlied@linux.ie>
Tue, 19 Dec 2006 22:30:32 +0000 (09:30 +1100)
committerDave Airlie <airlied@linux.ie>
Tue, 19 Dec 2006 22:30:32 +0000 (09:30 +1100)

Trivial merge