Merge branch 'master' of ssh://richardradeon@git.freedesktop.org/git/mesa/mesa
authorRichard Li <richardradeon@gmail.com>
Thu, 19 Nov 2009 21:17:13 +0000 (16:17 -0500)
committerRichard Li <richardradeon@gmail.com>
Thu, 19 Nov 2009 21:17:13 +0000 (16:17 -0500)

Trivial merge