Merge branch 'master' of ssh://carlh.dnsalias.org/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Sat, 27 Oct 2012 00:52:55 +0000 (01:52 +0100)
committerCarl Hetherington <cth@carlh.net>
Sat, 27 Oct 2012 00:52:55 +0000 (01:52 +0100)

Trivial merge