# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1297167631 0
# Node ID 30203ffaa6122101593e338ab6af88d50f4b0cd4
# Parent  5da98461a9f6f91b2e71c0abd280be63e8056e4d# Parent  05f9a2a9c753eb27deb355503dc8798f642f5ee2
Merge from branch "bug_67"