Merge branch 'master' into modesetting-gem
authorJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 3 Dec 2008 19:53:36 +0000 (11:53 -0800)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Wed, 3 Dec 2008 19:53:36 +0000 (11:53 -0800)

Trivial merge