Merge branch '1.0' of /home/carl/git/dvdomatic into 1.0

diff --combined wscript
index 7444a47d383fd761aa67056693564ac1577a49ce,cb473737b9852676dac6bf3c4936c34b1e3da55f..1bc6e7c2a722d45ae4a6ab5709d0829a89675a8c
--- 1/wscript
--- 2/wscript
+++ b/wscript
@@@ -3,7 -3,7 +3,7 @@@ import o
  import sys
  
  APPNAME = 'dcpomatic'
- VERSION = '1.26pre'
+ VERSION = '1.27pre'
  
  def options(opt):
      opt.load('compiler_cxx')
@@@ -51,12 -51,11 +51,12 @@@ def configure(conf)
          if conf.options.enable_debug:
              conf.env.append_value('CXXFLAGS', ['-mconsole'])
              conf.env.append_value('LINKFLAGS', ['-mconsole'])
 -        conf.check(lib = 'ws2_32', uselib_store = 'WINSOCK2', msg = "Checking for library winsock2")
 -        conf.check(lib = 'bfd', uselib_store = 'BFD', msg = "Checking for library bfd")
 -        conf.check(lib = 'dbghelp', uselib_store = 'DBGHELP', msg = "Checking for library dbghelp")
 -        conf.check(lib = 'iberty', uselib_store = 'IBERTY', msg = "Checking for library iberty")
 -        conf.check(lib = 'shlwapi', uselib_store = 'SHLWAPI', msg = "Checking for library shlwapi")
 +        conf.check(lib='ws2_32', uselib_store='WINSOCK2', msg="Checking for library winsock2")
 +        conf.check(lib='bfd', uselib_store='BFD', msg="Checking for library bfd")
 +        conf.check(lib='dbghelp', uselib_store='DBGHELP', msg="Checking for library dbghelp")
 +        conf.check(lib='iberty', uselib_store='IBERTY', msg="Checking for library iberty")
 +        conf.check(lib='shlwapi', uselib_store='SHLWAPI', msg="Checking for library shlwapi")
 +        conf.check(lib='mswsock', uselib_store='MSWSOCK', msg="Checking for library mswsock")
          boost_lib_suffix = '-mt'
          boost_thread = 'boost_thread_win32-mt'