# HG changeset patch
# User Chris Cannam
# Date 1429096703 -3600
# Node ID b89f8f5347c617f78f056d1cf161f50c2988ab18
# Parent  482f468e5c93002294e6cbaa10bf2919e0f56147# Parent  e3a245457b6ac44c276fa63f660e75587461186f
Merge from branch v1.0-linuxbuild