# HG changeset patch
# User Chris Cannam
# Date 1371730454 -3600
# Node ID 25603efa57b54184a7a8aec370df0d98adaf3acb
# Parent  1b1138f6f55ee01ccaa3b80f40da04cd90b325d5# Parent  b61a51fb42b9d424543f70f2ea38406de6700a31
Merge from live branch