# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1305018542 -3600
# Node ID 405dd646a6ccfcebf7f520b6a804d92f3fc9c2d8
# Parent  0964cbb517532027224ef3d4ea8e97d61003c628# Parent  576a1dca2ee271b8b7470e004fdb9ed516c4722e
Merge