Merge branch 'master' into modesetting-gem
authorJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 20 Nov 2008 19:01:24 +0000 (11:01 -0800)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 20 Nov 2008 19:01:24 +0000 (11:01 -0800)

Trivial merge