# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1301393667 -3600
# Node ID a89626bf10c7d1c3d101125115361518f1bff270
# Parent  1fbfab2f1624103c83f2a40be360691cc834fd62# Parent  1333582e34c4aacfe91cf0dba240482516e59d86
Merge