# HG changeset patch
# User Chris Cannam <chris.cannam@soundsoftware.ac.uk>
# Date 1321635347 0
# Node ID 6300012e354e317e0cdb68d0f8516430aeeb7296
# Parent  32d853e2e7edf4e50d34936c1fde061fcb4bfe09# Parent  a36cce72286051057d73c9223df1fab757243a42
Merge