# HG changeset patch
# User Chris Cannam
# Date 1301909470 -3600
# Node ID 6627ac1de32be1b44255b3b112ddb0675c6ad5e1
# Parent  0802551af0a58e626bb86a54ef2611213e4afca9# Parent  f25c73364bfb9577aea1e955142ea350201fb506
Merge from branch "cannam-pre-20110113-merge" (includes merge from feature_121)