# HG changeset patch
# User Chris Cannam
# Date 1285942116 -3600
# Node ID 4f0493e7f13d875cc6a13c012ecb5bd0e3e4aa5d
# Parent  23e2c7fc6f038b25299423575b24bc5cba3fe145# Parent  12420e46bed9cd0bc1bbd344e9a78af4e357ed6a
* Merge from cannam branch