# HG changeset patch
# User Chris Cannam
# Date 1301332104 -3600
# Node ID 2c9d65eff2528185a9df66276d3e40ef18f34e32
# Parent  c80103b811941d830ff9bc934000a19d681540a7# Parent  cf680b8261175375c65452b42515a78be9a41fad
Merge from branch "cannam-pre-20110113-merge"