Merge branch 'master' of ssh://carlh.dyndns.org/home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Sun, 29 Sep 2013 20:08:37 +0000 (21:08 +0100)
committerCarl Hetherington <cth@carlh.net>
Sun, 29 Sep 2013 20:08:37 +0000 (21:08 +0100)

Trivial merge