# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1352803026 0
# Node ID 873d052b361bb5a819e88d406623dce6c95e1737
# Parent  52be96e8308021ca7cc818e76fa63b2abe20e01d# Parent  f2ec92061fca6731bac35576a7426741e196d861
Merge from browsing branch