Merge branch 'master' of /home/carl/git/dvdomatic
authorCarl Hetherington <cth@carlh.net>
Sun, 2 Dec 2012 20:55:33 +0000 (20:55 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 2 Dec 2012 20:55:33 +0000 (20:55 +0000)

Trivial merge