Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Sat, 20 Oct 2012 19:05:36 +0000 (20:05 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 20 Oct 2012 19:05:36 +0000 (20:05 +0100)

Trivial merge