# HG changeset patch
# User Chris Cannam
# Date 1429517494 -3600
# Node ID 32ab6c48efaa23d24a67315bccdc27f3ba1a18d5
# Parent  682d64f05e72d0d83ae0c75a7a4962c0eb3bbeee# Parent  135c5899a71f6dff31a3c847b660045c018ea36b
Merge from branch tonioni