# HG changeset patch
# User Chris Cannam
# Date 1401788739 -3600
# Node ID c0c679c3b5b953b952dbe45ccd62e36488f2be73
# Parent  b9d7352336ce3c0bb82cce206e008779af2d00f8# Parent  d75c9e0d5e7e06836f81bf9208e9891de5bbcd33
Merge from branch tonioni