# HG changeset patch
# User Chris Cannam
# Date 1363101247 0
# Node ID edf7563e26536d6753a087b8767772f5a8761809
# Parent  31aee88c279bbef624dcd515027e22fcff01586f# Parent  30c444ea13383c6a2a1df865b83401f0120fb281
Merge from branch "cannam"