Merge branch 'master-fd.o'
authorAustin Yuan <shengquan.yuan@intel.com>
Mon, 31 Aug 2009 08:29:11 +0000 (16:29 +0800)
committerAustin Yuan <shengquan.yuan@intel.com>
Mon, 31 Aug 2009 08:29:11 +0000 (16:29 +0800)

Trivial merge