# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1352469529 0
# Node ID c1b8a34d3560b90043972a6592e9275aee57f4cd
# Parent  6982f326cb06554d2889eea20573f5fa4e0f413f# Parent  c43450d547874fee7e6ab82a8f9c7c7a514d08fb
Merge