# HG changeset patch
# User Chris Cannam
# Date 1285943676 -3600
# Node ID d0edd5f981fd9ab101c455ee51fbf63216212d6d
# Parent  4f0493e7f13d875cc6a13c012ecb5bd0e3e4aa5d# Parent  192d132064a5bb020da68969684a2fbdf84707fa
* Merge from cannam branch