Merge branch 'yinghai' into test
authorLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:35:56 +0000 (23:35 -0400)
committerLen Brown <len.brown@intel.com>
Thu, 23 Oct 2008 03:35:56 +0000 (23:35 -0400)

Trivial merge