# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1301654505 -3600
# Node ID d1eb5d381a77aac28ca1b039bca3aa9858b6d4cf
# Parent  96cfb24411c60d7802688e7d5d4195b1aa41ef6c# Parent  30f68ecfdde48d9b3f239efab97160d56adf162b
Merge