# HG changeset patch
# User Chris Cannam
# Date 1405694324 -3600
# Node ID d1abf593dfaf831fcf2d6d7ae9e621558aa291b4
# Parent  2484e6f95c061639135bbd51998bcaa27281c7c1# Parent  ad33fdc4ad922d1ca3aed547cad78f17cd2718e7
Merge from branch tonioni