# HG changeset patch
# User Chris Cannam
# Date 1350401330 -3600
# Node ID f8985bd5d0d6fdbd47584437fc6029c9d20dab9a
# Parent  352539ac7b434b1f001835150bf26208f1ab6b4d# Parent  5251072c02b6eb441f76a5d98b4b6f705bb92b9f
Merge from branch "feature_523"