# HG changeset patch
# User Chris Cannam
# Date 1322054631 0
# Node ID 7429d10cc491623513608f8cf491d5eebe7bac7b
# Parent  548e23d4cd71e435048ea695d8f9803c439c8eb5# Parent  0a5bc55527a6e69f0b4e41edfffdcd8c4c576930
Merge from branch "cannam"