# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1305023982 -3600
# Node ID c759f8787b079abca9198273b4151f260b9ab0c8
# Parent  405dd646a6ccfcebf7f520b6a804d92f3fc9c2d8# Parent  a9921f3e908861f9d973b1b73be1f0fccf3fcf76
Merge