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