# HG changeset patch
# User Chris Cannam
# Date 1429517537 -3600
# Node ID 78c152e4db958ac5a36e0fba3102cb6fdc52dd62
# Parent  78e041e45ff0ff3c103e0d794c6f66f391020aff# Parent  788b7623bfcae2b974c683313682a088c864588e
Merge from branch tonioni