# HG changeset patch
# User Chris Cannam
# Date 1401789789 -3600
# Node ID e7a3fa8f4eec7c85ab80e5b1ddab1e2a60633c2c
# Parent  1d8cb0d92f4bb14231684f29fc329524f1aa065c# Parent  4969e7921931e130c6fa819d3fdfa636a32725b7
Merge from branch tonioni