Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 1 Aug 2012 23:59:59 +0000 (00:59 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 1 Aug 2012 23:59:59 +0000 (00:59 +0100)

Trivial merge