# HG changeset patch
# User Chris Cannam
# Date 1374146505 -3600
# Node ID 45dbcd39b9e9f1b6520b970db4eb0e37e188a15d
# Parent  0f5c32bfd33e91367aac53787a7ad7db7994e03b# Parent  a48be8a8bcbada2ec3d66f71fbddf9bedf7a1eb1
Merge from branch cannam