# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1358866172 0
# Node ID 7f57e82048a4f61f1df06619bed238f94a9ad5a9
# Parent  f37237021a460d5586d30a4d12a19ff1000683e6# Parent  e19f375f9afa18c700a7c6e035bb24d126341166
Merge