# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1311685698 -3600
# Node ID 0058debf7871ce6d5240d057b9b2323e4c0e2f4a
# Parent  7c7199e1f1744d4b8ee41fc816566d650a78bd49# Parent  76d064830472d12b55876e0a9bbf60c858296126
Merge from branch "feature_36"