Merge commit 'anholt/drm-gem' into drm-gem
authorKeith Packard <keithp@keithp.com>
Tue, 6 May 2008 21:43:56 +0000 (14:43 -0700)
committerKeith Packard <keithp@keithp.com>
Tue, 6 May 2008 21:43:56 +0000 (14:43 -0700)

Trivial merge