Merge branch 'master-fd.o' ww36.4-video
authorAustin Yuan <shengquan.yuan@intel.com>
Thu, 3 Sep 2009 03:25:10 +0000 (11:25 +0800)
committerAustin Yuan <shengquan.yuan@intel.com>
Thu, 3 Sep 2009 03:25:10 +0000 (11:25 +0800)

Trivial merge