Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
authorNian Wu <nian.wu@intel.com>
Mon, 12 Mar 2007 01:03:27 +0000 (09:03 +0800)
committerNian Wu <nian.wu@intel.com>
Mon, 12 Mar 2007 01:03:27 +0000 (09:03 +0800)

Trivial merge