# HG changeset patch
# User Chris Cannam
# Date 1315583781 -3600
# Node ID 202986dd17e4e02b3622b65cf38f358b67a393e8
# Parent  45ec06a8eec9b733a4b039c2f3c2f0684fe9d2b3# Parent  0ec052b8b297cf139b422fa62df2739dd12c1bda
Merge from branch "cannam_integration"