Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Tue, 7 Jan 2014 13:41:57 +0000 (13:41 +0000)
committerCarl Hetherington <cth@carlh.net>
Tue, 7 Jan 2014 13:41:57 +0000 (13:41 +0000)

Trivial merge