Merge branch 'cmenu-video' of git://git.zytor.com/users/pam/hdt-pierre into cmenu...
authorPierre-Alexandre Meyer <pierre@mouraf.org>
Fri, 4 Sep 2009 23:54:24 +0000 (16:54 -0700)
committerPierre-Alexandre Meyer <pierre@mouraf.org>
Fri, 4 Sep 2009 23:54:24 +0000 (16:54 -0700)

Trivial merge