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)
commit1b79b27da172d6c868746135feeb71de4ddd0646
tree567ab66f1a60e322d161e0e44bdf48cb13e55c66
parent7674416db4ee3d43813dddb650364ca994755256
parentfa89b6089b5f4c7a5244b642caaca3e72b06ebe4
Merge branch 'yinghai' into test