# HG changeset patch
# User Chris Cannam
# Date 1315582476 -3600
# Node ID cd9499a11381c53e8037922984123757f097cb83
# Parent  eaec823e6e23e030a48ec1c66a0f5657159fbc8b# Parent  7fc15203288c17d1fe18d74e154f4767107a470b
Merge from branch "cannam"