# HG changeset patch
# User Chris Cannam
# Date 1350398172 -3600
# Node ID 352539ac7b434b1f001835150bf26208f1ab6b4d
# Parent  42e2437766c25d9276bda891ae1221d5f7c3d377# Parent  35782bf2eb588cc1dfd8a62b2df22aadca38c172
Merge from branch "bug_521"