Merge branch 'video-player' of /home/carl/git/dvdomatic into video-player
authorCarl Hetherington <cth@carlh.net>
Fri, 21 Dec 2012 23:10:41 +0000 (23:10 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 21 Dec 2012 23:10:41 +0000 (23:10 +0000)

Trivial merge