Merge branch 'r500-fp'
authorDave Airlie <airlied@redhat.com>
Mon, 24 Mar 2008 08:47:50 +0000 (18:47 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 24 Mar 2008 08:47:50 +0000 (18:47 +1000)

Trivial merge