# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1301656381 -3600
# Node ID 3e8c33cbb8e06612d618da3bc3054426d9745bb7
# Parent  7a616ddc3331814fb70a40e74f98520bcc65dab8# Parent  7d8567890fa37eeddaa7d547544625d9fd07dda6
Merge