Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Fri, 20 Dec 2013 16:47:27 +0000 (16:47 +0000)
committerCarl Hetherington <cth@carlh.net>
Fri, 20 Dec 2013 16:47:27 +0000 (16:47 +0000)

Trivial merge