Merge remote branch 'origin/vga-arbiter'
authorDave Airlie <airlied@redhat.com>
Fri, 21 Aug 2009 03:27:11 +0000 (13:27 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 21 Aug 2009 03:27:11 +0000 (13:27 +1000)

Trivial merge