# HG changeset patch
# User Chris Cannam
# Date 1371201926 -3600
# Node ID a778eeeeec773ccc0a12dfd9c3f2f789cca2f382
# Parent  44475ccf56d3fd06457f5449e64847c82ab2ad86# Parent  cf4cc816278aa7cc8f39a465f52304f6e91dd34a
Merge from live branch