# HG changeset patch
# User Chris Cannam
# Date 1358942514 0
# Node ID e60f4ccfdc70c5a8cb241c86f8e470fe3bf3f585
# Parent  c63e31776f92efb3ef1f0400a8d9849270c1fa8a# Parent  d6d53a77f058b9028014550e13570cd2729486e6
Merge from branch "cannam"