Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa
authorJesse Barnes <jesse.barnes@intel.com>
Tue, 11 Sep 2007 10:55:40 +0000 (03:55 -0700)
committerJesse Barnes <jesse.barnes@intel.com>
Tue, 11 Sep 2007 10:55:40 +0000 (03:55 -0700)

Trivial merge