# HG changeset patch
# User Chris Cannam
# Date 1374146517 -3600
# Node ID 7c0909052511a3d3f1932f4c85ffd109f190ed24
# Parent  25603efa57b54184a7a8aec370df0d98adaf3acb# Parent  45dbcd39b9e9f1b6520b970db4eb0e37e188a15d
Merge from live branch