# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1301566401 -3600
# Node ID 3564e1ae2ff7213987b57f84bc92497ae08b3f3a
# Parent  5410d82c12df80cf546dacacbbaeeafaaa665211# Parent  b6ec5451fd0dc9c6d41f862167e3cb592cf584bf
Merge