Importing fixes from drm-ttm-0-2-branch
authorThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Thu, 19 Oct 2006 15:00:03 +0000 (17:00 +0200)
committerThomas Hellstrom <thomas-at-tungstengraphics-dot-com>
Thu, 19 Oct 2006 15:00:03 +0000 (17:00 +0200)

Trivial merge