Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Mon, 15 Oct 2012 11:42:22 +0000 (12:42 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 15 Oct 2012 11:42:22 +0000 (12:42 +0100)

Trivial merge