# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1328096762 0
# Node ID 9ae8d24eaf94dbd205a6b50041be70817d3001c2
# Parent  d48eeb5d65699baaf74c3f1fc4c668f8fc2d5467# Parent  899414bdd24e53ef1ed4428636eca4c487187fb6
Merge