# HG changeset patch
# User Chris Cannam
# Date 1440078861 -3600
# Node ID 296ccd36f6265b22f7143d7d2231c65158bf563f
# Parent  788b7623bfcae2b974c683313682a088c864588e# Parent  8588b97f1d1c324a9d2c14e646b07fc00442172f
Merge through to branch for Tony 2.0