Merge branch 'staging' of /home/carl/git/dvdomatic into staging
authorCarl Hetherington <cth@carlh.net>
Fri, 19 Apr 2013 10:15:57 +0000 (11:15 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 19 Apr 2013 10:15:57 +0000 (11:15 +0100)

Trivial merge