# HG changeset patch
# User Chris Cannam <chris.cannam@eecs.qmul.ac.uk>
# Date 1308744110 -3600
# Node ID 2af4b5b0bf8340dd3e15ec94a64546c49c2803dd
# Parent  498c2ca0b3677c86682e43962b189d60167fef5a# Parent  653e9694a69413cb140b035a45656b15a046d632
Merge from branch "ignore"