# HG changeset patch
# User Chris Cannam
# Date 1404335050 -3600
# Node ID a6bfe009523afa92680783318a04878507157820
# Parent  0009b2b066e0276e892e4e0c2e2a4f2876d5f3ac# Parent  178ffa964096f32ace219b21e0fb2e7e71bde1a2
Merge from tonioni branch