# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1311602431 -3600
# Node ID 7c7199e1f1744d4b8ee41fc816566d650a78bd49
# Parent  ceca8eb1ac6ec1cce1a9f5620964a6bd4a77ff81# Parent  af95d9a7507a05006621b57522b7c9701caec69a
Merge from branch "feature_36"