Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
authorNian Wu <nian.wu@intel.com>
Tue, 6 Mar 2007 21:01:23 +0000 (16:01 -0500)
committerNian Wu <nian.wu@intel.com>
Tue, 6 Mar 2007 21:01:23 +0000 (16:01 -0500)
commit87c9ad6fd57a60c29dc83c8a538e70a93d125e25
treee4c3aaecfcc01ee6ef65cf3496256dcc8c9e89de
parentc05b6f800a1d4726ea92a20aab99dde5d00b5e17
parent1c70cde8881f794782780cbd695da0882f78c769
Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline