# HG changeset patch
# User Chris Cannam
# Date 1403112619 -3600
# Node ID 2481777d4c3e3e3907b9e5e931aba439b08f4130
# Parent  0c1d6de8f44bc158bcb55866874602bcb912e2cf# Parent  f960d67ce84237be28902f24d5c757a72dc8004b
Merge from branch tonioni (the two are currently in sync)