# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1310468017 -3600
# Node ID 57c28ea4c482c69852beb2fddb24f217ba1f3548
# Parent  1c1ee0b2a1074e1026e89cfeb1d3be35be0bcc1c# Parent  cd64fb9ab7010563f2c2f1e2a1a6f5a05ce14434
Merge