# HG changeset patch
# User Chris Cannam
# Date 1352988790 0
# Node ID 7529d85a20ea95e9e84807e2c8828cfe0fde005d
# Parent  0655dd267a2981b68a417086e6ea41e010d398be# Parent  ab0e59f856ba819d912a2329c2b27c7b66cdc275
Merge