# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1305018554 -3600
# Node ID 165e443660c46cb2dbc880a41ccbde1a074a52cc
# Parent  e7c58b88e670e7d831f46647e818c712bbe2ede2# Parent  576a1dca2ee271b8b7470e004fdb9ed516c4722e
Merge