# HG changeset patch
# User Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
# Date 1380623199 -3600
# Node ID 1d0e7091f39d5f690689fae8faf1fdde5ee74c15
# Parent  2ea902f89da490b00eab2c8b217275843819aefd# Parent  9680e1056ac6d0614fb0305e01f6f90af8cdf4f1
Merge from the default branch