# HG changeset patch
# User Chris Cannam
# Date 1403096160 -3600
# Node ID 2700e13716efd057fdbcb3ed85437c9806c1263a
# Parent  048daa7513de602e2f4cfcbea7a56ecd14a17927# Parent  e2eca1898050921014aaa585884e173e2e0bf341
Merge from branch tony_integration