# HG changeset patch
# User Chris Cannam
# Date 1301392232 -3600
# Node ID eabb08b4afc36de0475e8472fd7ba45a717e2093
# Parent  2c9d65eff2528185a9df66276d3e40ef18f34e32# Parent  5835a1beeb1154cb1026bc0702f0fcbb760207ba
Merge from branch "bug_70"