Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesa
authorKarl Schultz <karl.w.schultz@gmail.com>
Wed, 10 Feb 2010 22:22:07 +0000 (15:22 -0700)
committerKarl Schultz <karl.w.schultz@gmail.com>
Wed, 10 Feb 2010 22:22:07 +0000 (15:22 -0700)

Trivial merge