# HG changeset patch
# User Chris Cannam
# Date 1399654456 -3600
# Node ID c2b9b781f0069966140977d0f6fe4faae561634e
# Parent  0db5796a41da2d3a650cfe8dc4113b01618d3f1a# Parent  c63a27614970c957da8eee98600b156f882593a4
Merge from branch "tony_integration"