# HG changeset patch
# User Chris Cannam
# Date 1401789588 -3600
# Node ID 052cbaad991eec9d8bdf1069bb173fa5513f21c1
# Parent  6d95d87f1654be69a75e99d0cba7903347808cdc# Parent  bf0b419fdaac5e92ed5cfae5c448cf3e1f967913
Merge from branch tonioni