Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Fri, 2 Mar 2012 23:26:44 +0000 (23:26 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 2 Mar 2012 23:26:44 +0000 (23:26 +0000)

Trivial merge