Merge branch 'master' of /home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Thu, 8 Aug 2013 15:08:22 +0000 (16:08 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 8 Aug 2013 15:08:22 +0000 (16:08 +0100)

Trivial merge