# HG changeset patch
# User Chris Cannam
# Date 1328096007 0
# Node ID d48eeb5d65699baaf74c3f1fc4c668f8fc2d5467
# Parent  c7ef5a1ed2d30cbe8e409ce4d7cb1433513f4b20# Parent  b4c5b0dc36c9b1840f9f4eb316ef4691d4e2e5d4
Merge from branch "bug_366"