# HG changeset patch
# User Chris Cannam
# Date 1301392164 -3600
# Node ID 1fbfab2f1624103c83f2a40be360691cc834fd62
# Parent  cf680b8261175375c65452b42515a78be9a41fad# Parent  5835a1beeb1154cb1026bc0702f0fcbb760207ba
Merge from branch "bug_70"