Merge branch 'master' of ssh://zack@git.freedesktop.org/git/mesa/mesa
authorZack Rusin <zackr@vmware.com>
Mon, 24 Aug 2009 20:39:25 +0000 (16:39 -0400)
committerZack Rusin <zackr@vmware.com>
Mon, 24 Aug 2009 20:39:25 +0000 (16:39 -0400)

Trivial merge