# HG changeset patch
# User Chris Cannam
# Date 1403112650 -3600
# Node ID 98afba87887f41ae6042bd907c2d15315957d4ea
# Parent  dfcc5b355f33005e177317d738031a8515812c4e# Parent  1162c93e76880751100f7bf42969fa9b5176e13c
Merge from branch tonioni (the two are currently in sync)