Merge.

diff --cc cscript
index 7df466757edef069325999be2fca131822f14c40,a1ff15bfc046770a4c34ee0823ddda94f5004494..4dc1363934c836453e5c29cd65e34c41162dbeb7
--- 1/cscript
--- 2/cscript
+++ b/cscript
@@@ -1,7 -1,7 +1,7 @@@
  import os
  
  def dependencies(target):
-     return (('libdcp', 'e33e3b8'),)
 -    return (('libdcp', '03fb9d4'), ('asdcplib-cth', 'carl'))
++    return (('libdcp', 'e33e3b8'), ('asdcplib-cth', 'carl'))
  
  def build(target, options):
      cmd = './waf configure --prefix=%s' % target.directory