# HG changeset patch
# User Chris Cannam
# Date 1394559199 0
# Node ID a352fb986e7bc499d04f0637c8874b41826e2d2c
# Parent  e5f4385615ac87c8cc9d93fd453b0f91add6a486# Parent  56ba2b03508ecc2f5952a8db978360503845e711
Merge from branch tonioni