# HG changeset patch
# User Chris Cannam
# Date 1405694301 -3600
# Node ID ea098f7565eb3349c74a215c7a6d2768127e9ace
# Parent  2d4af227fd32bea8cdf1b70859a2c0f26c3d5451# Parent  43256b925e1509a0a07b38f30160ae72d6509dd5
Merge from branch tonioni