Merge branch 'master' of /home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Wed, 24 Apr 2013 12:48:11 +0000 (13:48 +0100)
committerCarl Hetherington <cth@carlh.net>
Wed, 24 Apr 2013 12:48:11 +0000 (13:48 +0100)

Trivial merge