# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1310398940 -3600
# Node ID 4c0d58c5d1e0e9edcc3a4997a6f1c1aaf44f7842
# Parent  32dd9e02950ab0febd2bfa2ceb0d528a5aa90817# Parent  ef125e1f3a109790a97139f1c41f8e8f73e746e1
Merge