# HG changeset patch
# User Chris Cannam
# Date 1429096628 -3600
# Node ID 482f468e5c93002294e6cbaa10bf2919e0f56147
# Parent  1a8ad855b7cbbbf23ed3ba6f37962fd98b4033ad# Parent  7a5e47d2f0eb699f00b102dc94f4a7daaf604c64
Merge from branch v1.0-linuxbuild