# HG changeset patch
# User Chris Cannam
# Date 1300277930 0
# Node ID b422d1bcfb3c3fb4d7e592c19d97243817b90e85
# Parent  987a094047c97f2ad2d004424a6df8fa00688133# Parent  076c2b3de51be3f470b4bb8dfad55a2fbe4cd120
Merge from branch "bug_92"