# HG changeset patch
# User Chris Cannam
# Date 1404335050 -3600
# Node ID 71090a49d487b9eaefc5d2e19e0004b3eabfc5a9
# Parent  6a84102c006a2bf76774e3f66a8c03a1351e97db# Parent  d8bde801ebd40d722df379eee3b40729d3b78380
Merge from tonioni branch