# HG changeset patch
# User Chris Cannam
# Date 1328196407 0
# Node ID 8623d131c9ad321b687c76278d99a8ef8a7f963d
# Parent  aa0ad9ab384b5aef48470fda12562d16d962358f# Parent  6e80a22916e94668524aa0c2c37b736355bddfac
Merge from branch "cannam"