Merge branch 'master' of git+ssh://agd5f@git.freedesktop.org/git/mesa/mesa
authorAlex Deucher <alexdeucher@gmail.com>
Thu, 22 Oct 2009 16:29:36 +0000 (12:29 -0400)
committerAlex Deucher <alexdeucher@gmail.com>
Thu, 22 Oct 2009 16:29:36 +0000 (12:29 -0400)

Trivial merge