Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 1 Mar 2013 17:30:50 +0000 (17:30 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 1 Mar 2013 17:30:50 +0000 (17:30 +0000)

Trivial merge