Merge branch 'external-audio' of ssh://houllier/home/carl/git/dvdomatic into external...