Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player
authorCarl Hetherington <cth@carlh.net>
Thu, 20 Dec 2012 00:27:18 +0000 (00:27 +0000)
committerCarl Hetherington <cth@carlh.net>
Thu, 20 Dec 2012 00:27:18 +0000 (00:27 +0000)

Trivial merge