# HG changeset patch
# User Chris Cannam
# Date 1403007446 -3600
# Node ID c32393c093049000d4f9d3bdee404269a9146ba8
# Parent  8b631ce73b1c7f28df545190bc42e1d7271f39ff# Parent  f5c914661f6fdc7f05c2c980b0d21350d5933428
Merge from branch "tonioni"