Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Wed, 10 Jul 2013 23:22:54 +0000 (00:22 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 10 Jul 2013 23:22:54 +0000 (00:22 +0100)

Trivial merge