# HG changeset patch
# User Chris Cannam
# Date 1308059309 -3600
# Node ID 1ae54a29e59ea1b6a8d825b0eed55c3b17f090ff
# Parent  4c484636d5ec951730e60aff7b3c832804798ada# Parent  f4960f8ce79854a24cfd7005872ec5addc1473c1
Merge from debug-output branch