# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1310399445 -3600
# Node ID 1c1ee0b2a1074e1026e89cfeb1d3be35be0bcc1c
# Parent  ce06e8f773e2d64e4aaed6d2cf2cd30be553989c# Parent  0b44fc2cdd00cee784bad2fa7d14042255779345
Merge