# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1310634852 -3600
# Node ID 3cab7f3ad3c7244cc9c62b9a0d30dbef41fc3f56
# Parent  b9f81065a8e10c24948cca84dee1554e3638165b# Parent  5d608412b003892130661b5b596a01b813da5512
Merge