Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Tue, 8 Oct 2013 21:29:16 +0000 (22:29 +0100)
committerCarl Hetherington <cth@carlh.net>
Tue, 8 Oct 2013 21:29:16 +0000 (22:29 +0100)

Trivial merge