# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1302539291 -3600
# Node ID 59a5c4d96ff21ebe18ed78e43204533f2511ce43
# Parent  f25c73364bfb9577aea1e955142ea350201fb506# Parent  7ba3ba2a0f633e3a364581950080a6094fc9da70
Merge