Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
authorDan Nicholson <dbn.lists@gmail.com>
Tue, 6 May 2008 21:29:59 +0000 (14:29 -0700)
committerDan Nicholson <dbn.lists@gmail.com>
Tue, 6 May 2008 21:29:59 +0000 (14:29 -0700)

Trivial merge