Merge branch '1.0' of git.carlh.net:git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Wed, 22 Apr 2015 13:01:43 +0000 (14:01 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 22 Apr 2015 13:01:43 +0000 (14:01 +0100)

Trivial merge