Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Thu, 11 Jul 2013 09:15:14 +0000 (10:15 +0100)
committerCarl Hetherington <cth@carlh.net>
Thu, 11 Jul 2013 09:15:14 +0000 (10:15 +0100)

Trivial merge