Merge branch 'sync-fdo-master' 01/501/1
authorAustin Yuan <shengquan.yuan@intel.com>
Tue, 1 Dec 2009 03:20:10 +0000 (11:20 +0800)
committerAustin Yuan <shengquan.yuan@intel.com>
Tue, 1 Dec 2009 03:20:10 +0000 (11:20 +0800)

Trivial merge