Merge.

diff --cc cscript
index 65531f0f1604e354d37d3b681b002c3608f50ff9,d5fe846e7498018e67bd384b909df97d2cbbe1a7..4d5b4bf1ac0ff368e833f7248034a9c73b85730e
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -6,8 -6,8 +6,8 @@@ def dependencies(target)
      if target.platform == 'windows':
          return ()
      else:
 -        return (('ffmpeg-cdist', '8f60a48995ae837c6e2f0f207b378e52f394e34a'),
 +        return (('ffmpeg-cdist', '0d76267f36cbf01acd6a2a96ad2f7497a1843862'),
-                 ('libdcp', 'v0.70'))
+                 ('libdcp', '6b3a021409b55e0b5988a0bb993020f6c0e66276'))
  
  def build(target):
      cmd = './waf configure --prefix=%s' % target.work_dir_cscript()