# HG changeset patch
# User Chris Cannam
# Date 1403112648 -3600
# Node ID f82dece35d213e4eb2f1835825fea803f46fd5f0
# Parent  c4ef666721bf7c5f1174e700736e1a84dea8a224# Parent  b68af2be4545adf04eec58c50d8419dc574b8642
Merge from branch tonioni (the two are currently in sync)