# HG changeset patch
# User Chris Cannam
# Date 1300285368 0
# Node ID 39a616befdbd156ca5f0089f64e0ab82a6312373
# Parent  b422d1bcfb3c3fb4d7e592c19d97243817b90e85# Parent  293d91cf44deafc5eed1b4a84a041828fae76d6a
Merge from branch "bug_90"