# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1310554788 -3600
# Node ID f6ed606887bc1d4c4e47ab19fd633b6a898904cd
# Parent  970f46489d295c1e7471786bfdea44d40cdb4408# Parent  eef2e2ed53c9b69cb06508271e84087ae7b4ae95
Merge