# HG changeset patch
# User Chris Cannam
# Date 1322046954 0
# Node ID 548e23d4cd71e435048ea695d8f9803c439c8eb5
# Parent  37e39e437b2c30e83598befa496dc6133483c46a# Parent  6fa65a4528880783fdc2bec75de30e7b96cc3440
Merge from branch "cannam"