Merge branch 'master' into nouveau-1
authorDave Airlie <airlied@starflyer-ubuntu.(none)>
Mon, 28 Aug 2006 14:01:19 +0000 (00:01 +1000)
committerDave Airlie <airlied@starflyer-ubuntu.(none)>
Mon, 28 Aug 2006 14:01:19 +0000 (00:01 +1000)

Trivial merge