Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline
authorNian Wu <nian@tinderbox.sh.intel.com>
Tue, 27 Feb 2007 19:42:16 +0000 (14:42 -0500)
committerNian Wu <nian@tinderbox.sh.intel.com>
Tue, 27 Feb 2007 19:42:16 +0000 (14:42 -0500)

Trivial merge