Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 18 Feb 2013 19:54:51 +0000 (19:54 +0000)
committerCarl Hetherington <cth@carlh.net>
Mon, 18 Feb 2013 19:54:51 +0000 (19:54 +0000)

Trivial merge