Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
authorNian Wu <nian.wu@intel.com>
Fri, 2 Mar 2007 14:01:27 +0000 (09:01 -0500)
committerNian Wu <nian.wu@intel.com>
Fri, 2 Mar 2007 14:01:27 +0000 (09:01 -0500)

Trivial merge