Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
authorCorbin Simpson <MostAwesomeDude@gmail.com>
Sun, 18 Oct 2009 02:58:23 +0000 (19:58 -0700)
committerCorbin Simpson <MostAwesomeDude@gmail.com>
Sun, 18 Oct 2009 02:58:23 +0000 (19:58 -0700)

Trivial merge