Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
authorNian Wu <nian.wu@intel.com>
Tue, 6 Mar 2007 12:43:03 +0000 (07:43 -0500)
committerNian Wu <nian.wu@intel.com>
Tue, 6 Mar 2007 12:43:03 +0000 (07:43 -0500)

Trivial merge