# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1311765837 -3600
# Node ID 168714032c7e4a7ad7f91f35bfe1fdec6c99f33a
# Parent  0058debf7871ce6d5240d057b9b2323e4c0e2f4a# Parent  dd9d9c0ff0f999b0e95586b35e928bc6d19567ac
Merge from branch "feature_36"