Merge branch 'master' into modesetting-101
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Fri, 26 Oct 2007 08:33:42 +0000 (10:33 +0200)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Fri, 26 Oct 2007 08:33:42 +0000 (10:33 +0200)

Trivial merge