Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
authorNian Wu <nian.wu@intel.com>
Wed, 21 Mar 2007 09:00:32 +0000 (17:00 +0800)
committerNian Wu <nian.wu@intel.com>
Wed, 21 Mar 2007 09:00:32 +0000 (17:00 +0800)

Trivial merge