# HG changeset patch
# User Chris Cannam
# Date 1350402471 -3600
# Node ID e89e425134aea2b2c7ff350abe4df67029924ca1
# Parent  f8985bd5d0d6fdbd47584437fc6029c9d20dab9a# Parent  3c5858c5794da0aa71e121e1bb09dc737cfcc383
Merge from branch "feature_523"