# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1313156444 -3600
# Node ID 91389d8bbdeaa08027710f971da51ce96e6788e3
# Parent  a2192366d309c34d7f1199b0d7cbe4a41088fe4c# Parent  edce3dafd217ea97babcc040c48696e45ca46f80
Merge from bug_255