# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1301581300 -3600
# Node ID 712264d5d60a5e09c6bb9f5e243f12a5d41bbdfc
# Parent  3564e1ae2ff7213987b57f84bc92497ae08b3f3a# Parent  1a514b9347d48f02cb64bf4431e7a5219f769611
Merge