# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1321969070 0
# Node ID 6fa65a4528880783fdc2bec75de30e7b96cc3440
# Parent  4719c1f813fc1f285d23fb45a1c096d95725eda9# Parent  c8aec937ea532f499638323112a24892ae960a4c
Merge from branch feature_14