Merge branches 'video' and 'video-edid' into release
authorLen Brown <[email protected]>
Fri, 28 May 2010 20:18:12 +0000 (16:18 -0400)
committerLen Brown <[email protected]>
Fri, 28 May 2010 20:18:12 +0000 (16:18 -0400)

Trivial merge