# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1295517651 0
# Node ID ddcedb549d4e2e1d1e228c780c738f8ca5d6a0fb
# Parent  6a2f8e88344ebf1e36bec0534350af0ed440e182# Parent  637d05516475012fde76c62209ac765bf81521ba
Merge from live branch