# HG changeset patch
# User Chris Cannam
# Date 1285339888 -3600
# Node ID 9fd6221709a675fbdc090e388241fcb5621053d7
# Parent  39511236fe36ed4ec99013dabafc24ea17767e7f# Parent  ca82a3468d27bea34ffb4730f6fea10e25f1e731
* Merge cannam branch