# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1301656978 -3600
# Node ID bb5e1ca422f8c7957cd25098cf7b997363b08183
# Parent  8da54f33a17b1dd6a30e5b6a4e5e0680e6e4d5bc# Parent  4188c6eaadf7ca41fef8505687db5212b1c01c78
Merge