Merge branch 'test'
authorAustin Yuan <shengquan.yuan@intel.com>
Mon, 24 Aug 2009 16:35:05 +0000 (00:35 +0800)
committerAustin Yuan <shengquan.yuan@intel.com>
Mon, 24 Aug 2009 16:35:05 +0000 (00:35 +0800)

Trivial merge