# HG changeset patch
# User Chris Cannam
# Date 1311972048 -3600
# Node ID a1e091bee818ffe5699ac43839798c76035bc705
# Parent  168714032c7e4a7ad7f91f35bfe1fdec6c99f33a# Parent  56ad0c490f5e65dc5514b53031d92531bff4daa0
Merge from branch "feature_36"