Merge remote branch 'origin/modesetting-gem' into modesetting-gem
authorDave Airlie <airlied@redhat.com>
Tue, 30 Sep 2008 04:17:27 +0000 (14:17 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 30 Sep 2008 04:17:27 +0000 (14:17 +1000)

Trivial merge