Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
authorNian Wu <nian.wu@intel.com>
Wed, 7 Mar 2007 21:01:36 +0000 (16:01 -0500)
committerNian Wu <nian.wu@intel.com>
Wed, 7 Mar 2007 21:01:36 +0000 (16:01 -0500)

Trivial merge