# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1312221924 -3600
# Node ID 61e0de6cc1bb3464b6f426849e908be62e987412
# Parent  a1e091bee818ffe5699ac43839798c76035bc705# Parent  2df99e8d191eebed54e2cdf6822bf17a0832c73c
Merge from branch "feature_36"