# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1312902128 -3600
# Node ID 031d70972601742dbada47b402ed91816eaa76d6
# Parent  fca539d668a28844d196deedabf3bdfc635f415a# Parent  e1699e8d6d69341d580ca887579d94d896696e73
Merge from feature_36