# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1305018624 -3600
# Node ID 6b3e9f512761ac5152015fe7e123419c87dc9d6e
# Parent  c6f2ad88bc9c6f174a68525e5369ac2d0411231b# Parent  165e443660c46cb2dbc880a41ccbde1a074a52cc
Merge