# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1307363527 -3600
# Node ID 34214e593c67b94578aba93467d502144887625f
# Parent  897979555864fbef4806a87ed6abdf098637c7f2# Parent  102056ec2de9edb82689a6e3ce889347d8ccc787
Merge from branch bug_169