# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1315308231 -3600
# Node ID 47b21bb3fa03fd479fea389b160cb44bd6fe5479
# Parent  031d70972601742dbada47b402ed91816eaa76d6# Parent  d0fec261c16977733458906e6a2aed581a354efa
Merge from branch "feature_36"