# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1358864096 0
# Node ID f37237021a460d5586d30a4d12a19ff1000683e6
# Parent  4d1a31b309877981ee80cb46c89e81950aba6108# Parent  1027f0f3a81ada7858ef9639dfcd31816fea599f
Merge