Merge branch 'master' of git+ssh://znh@git.freedesktop.org/git/mesa/mesa
authorZou Nan hai <nanhai.zou@intel.com>
Thu, 25 Jan 2007 23:05:02 +0000 (07:05 +0800)
committerZou Nan hai <nanhai.zou@intel.com>
Thu, 25 Jan 2007 23:05:02 +0000 (07:05 +0800)

Trivial merge