Merge branch '1.0' of ssh://main.carlh.net/home/carl/git/libdcp into 1.0
authorCarl Hetherington <cth@carlh.net>
Fri, 18 Jul 2014 14:29:36 +0000 (15:29 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 18 Jul 2014 14:29:36 +0000 (15:29 +0100)

Trivial merge