# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1297789152 0
# Node ID 4d438600f46bbfd060f532fbe3ca8188781816bc
# Parent  c3544e9fd588b49462effa509f191c2d7e4a9569# Parent  45c691a2b709f4e41db9306ce4134ecddfe35604
Merge