# HG changeset patch
# User Chris Cannam
# Date 1400669634 -3600
# Node ID 7c0ce480a7a4aecebd5a122c24a71ab0fe6ed456
# Parent  f73be84f5c904b27928ba4410cd5c04d9cc1c642# Parent  2114b2545c271c394cd562c9eff8ade8768ad50a
Merge from branch finetune