Merge branch 'master' into mrst-video
authorAustin Yuan <shengquan.yuan@intel.com>
Tue, 29 Apr 2008 22:35:52 +0000 (18:35 -0400)
committerAustin Yuan <shengquan.yuan@intel.com>
Tue, 29 Apr 2008 22:35:52 +0000 (18:35 -0400)

Trivial merge