Merge branch 'master' of /home/carl/git/libdcp
authorCarl Hetherington <cth@carlh.net>
Fri, 3 May 2013 15:13:02 +0000 (16:13 +0100)
committerCarl Hetherington <cth@carlh.net>
Fri, 3 May 2013 15:13:02 +0000 (16:13 +0100)

Trivial merge