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