# HG changeset patch
# User Chris Cannam
# Date 1381336905 -3600
# Node ID 04cc33a44d4ccadf075bfdac9d48e92d8144b9fa
# Parent  ac411172d897beffb10e14d38475f82e03531976# Parent  5b52161fb03402f7366c5dab3d4752ac807da6d2
Merge from branch "cannam"