Merge branch 'master' of /home/carl/git/libdcp

diff --cc src/picture_frame.cc
Simple merge

diff --cc src/util.cc
Simple merge

diff --cc wscript
index 8829ccd870d9106a235ff9cb4e7357da5abed040,07519f75653a822e1bfc5950d9724b1a27d188ef..6bf75fd4b14fb21eae743d99977e916632a5d81a
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -1,8 -1,9 +1,8 @@@
  import subprocess
  import os
 -import lut
  
  APPNAME = 'libdcp'
- VERSION = '0.40pre'
+ VERSION = '0.41pre'
  
  def options(opt):
      opt.load('compiler_cxx')