# HG changeset patch
# User Chris Cannam
# Date 1350402453 -3600
# Node ID 4018f255c97b9e119d7d72f2c4d3f48e8618c74d
# Parent  a9f1192c9c79977bf9fd49e9823ba58255c8ad25# Parent  3c5858c5794da0aa71e121e1bb09dc737cfcc383
Merge from branch "feature_523"