# HG changeset patch
# User Chris Cannam
# Date 1350398223 -3600
# Node ID 910830dc222a956f65ad6c9bea7552c15c126b5a
# Parent  fa2a1b6cda26d4824ed436303bed98c148b3079d# Parent  35782bf2eb588cc1dfd8a62b2df22aadca38c172
Merge from branch "bug_521"