# HG changeset patch
# User Chris Cannam
# Date 1358942352 0
# Node ID c63e31776f92efb3ef1f0400a8d9849270c1fa8a
# Parent  d24c22d420eba8944b7c60006eac0b3ddb085779# Parent  adb5f38f6ab75ce758c9b6488c419f2e0f39dfce
Merge from branch cannam