Merge branch 'master-fd.o' 20090904_5.1.0.0123
authorAustin Yuan <shengquan.yuan@intel.com>
Thu, 3 Sep 2009 09:43:33 +0000 (17:43 +0800)
committerAustin Yuan <shengquan.yuan@intel.com>
Thu, 3 Sep 2009 09:43:33 +0000 (17:43 +0800)

Trivial merge