# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1302541410 -3600
# Node ID c4a0942f28976bb392f907ed7280ca9967eb47d1
# Parent  59a5c4d96ff21ebe18ed78e43204533f2511ce43# Parent  aef15dbf269298f683c7df024feb93351dd521a6
Merge