# HG changeset patch
# User Chris Cannam
# Date 1322056688 0
# Node ID b4e59a60b447ed0c9fecc5b50a54941d9d3ca21a
# Parent  7429d10cc491623513608f8cf491d5eebe7bac7b# Parent  aaa26ccafb00bb7d889b7f23067c0dc61681f3eb
Merge from branch "cannam"