Merge branch 'video-player' of ssh://houllier/home/carl/git/dvdomatic into video...