# HG changeset patch
# User Chris Cannam
# Date 1315298822 -3600
# Node ID eaec823e6e23e030a48ec1c66a0f5657159fbc8b
# Parent  bd1d512f9e1b4957dae1dc61641cd937566335c9# Parent  3ebf9b76e57f1e34db3f0baa0988f0c435b15d75
Merge from branch "cannam"