Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa
authorZou Nan hai <nanhai.zou@intel.com>
Tue, 27 Mar 2007 01:41:31 +0000 (09:41 +0800)
committerZou Nan hai <nanhai.zou@intel.com>
Tue, 27 Mar 2007 01:41:31 +0000 (09:41 +0800)

Trivial merge