# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1312898046 -3600
# Node ID fca539d668a28844d196deedabf3bdfc635f415a
# Parent  049a1bcf38f14bba358f5bae164acc8ae1fb5941# Parent  f1ef292029563a8fd2cecf126e13a91bbd82347a
Merge from branch feature_36