# HG changeset patch
# User Chris Cannam
# Date 1374146367 -3600
# Node ID a6a25685e5a6aaade0c52b7063560abe22dfb30c
# Parent  9dbf79aee6dad3dbc8a55cb33d5f68244d0cb622# Parent  0f5c32bfd33e91367aac53787a7ad7db7994e03b
Merge from live branch