# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1358785423 0
# Node ID 820314b808cf110f7aafa1b6fb1c54a9505c7396
# Parent  a943f341c99d796c7c75ad1d16969ebe5aa2ef7d# Parent  4d1a31b309877981ee80cb46c89e81950aba6108
Merge from branch cannam