Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
authorNian Wu <nian.wu@intel.com>
Tue, 20 Mar 2007 05:10:46 +0000 (13:10 +0800)
committerNian Wu <nian.wu@intel.com>
Tue, 20 Mar 2007 05:10:46 +0000 (13:10 +0800)

Trivial merge