# HG changeset patch
# User Chris Cannam
# Date 1307634666 -3600
# Node ID a9f6345cb43d0ebbf1bb9c54b130eb69cbfd98c8
# Parent  6253d777aa12bb1235c1a6425478336b1c382235# Parent  73401a15037b7648cf21e9cb754612f739ea6979
Merge from branch "bug_182"