Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0
authorCarl Hetherington <cth@carlh.net>
Mon, 29 Apr 2013 13:46:27 +0000 (14:46 +0100)
committerCarl Hetherington <cth@carlh.net>
Mon, 29 Apr 2013 13:46:27 +0000 (14:46 +0100)

Trivial merge