Merge branch 'master' of /home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Thu, 3 Oct 2013 12:37:32 +0000 (13:37 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 3 Oct 2013 12:37:32 +0000 (13:37 +0100)

Trivial merge