# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1301670701 -3600
# Node ID 773777b12fa15aeaf81dbd6546c02831c72678f5
# Parent  bb5e1ca422f8c7957cd25098cf7b997363b08183# Parent  dcfde3922ec271759f144518bb2e59f193a0e2eb
Merge