# HG changeset patch
# User Chris Cannam
# Date 1308059362 -3600
# Node ID 025065fd5b49f3dd5bf99802a6898403d7c360e0
# Parent  85e59c901de9e364beb4ffaa9442834f62a7011c# Parent  8c13e8219903c17e4f262d530fb8bab96c63006c
Merge from debug-output branch