Merge delay-decode-take2 branch into master.
[dcpomatic.git] / waf
2012-07-14 Carl HetheringtonMove things round a bit.