# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1358939420 0
# Node ID bae194c522966e936d52e647397c89ac551c3f87
# Parent  579587187b7754014f095ca03349c68cc857ebb7# Parent  6a7198536816af8462cea7b83f3538190a9669dc
Merge from branch cannam