Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Wed, 8 Feb 2012 02:54:45 +0000 (02:54 +0000)
committerCarl Hetherington <cth@carlh.net>
Wed, 8 Feb 2012 02:54:45 +0000 (02:54 +0000)

Trivial merge