# HG changeset patch
# User Chris Cannam
# Date 1404335050 -3600
# Node ID fd95308b5d3fa6593ce007698c71b5d74d38d05e
# Parent  09026c8753016e662cf99c52b9c8163db4d5d41b# Parent  24f18a7dd26d0cb175adfa807b606ace84795327
Merge from tonioni branch