# HG changeset patch
# User Chris Cannam
# Date 1315582963 -3600
# Node ID 45ec06a8eec9b733a4b039c2f3c2f0684fe9d2b3
# Parent  cd9499a11381c53e8037922984123757f097cb83# Parent  ad6874c5c651442e6a4d5f2b7e244da25b4d68d6
Merge from branch "cannam_integration"