# HG changeset patch
# User Chris Cannam
# Date 1379407880 -3600
# Node ID ac411172d897beffb10e14d38475f82e03531976
# Parent  45dbcd39b9e9f1b6520b970db4eb0e37e188a15d# Parent  5b8bd53fd65c66368ce427f3af77e463ccb7e7ef
Merge from branch cannam