# HG changeset patch
# User Chris Cannam
# Date 1353520071 0
# Node ID 9b5b4e7970cda174274eeb4fcadd1f99a5b0d7ff
# Parent  7529d85a20ea95e9e84807e2c8828cfe0fde005d# Parent  b665182d9dd90f1de04adf414d979e1db65ea516
Merge from branch "cannam"