# HG changeset patch
# User Chris Cannam
# Date 1382443201 -3600
# Node ID 020bc7fe7a2a47783ead0b622ad547a546058ee9
# Parent  7465cceb8dfc72843cb1a9578ca387327ace974f# Parent  58335cde0730ce4105208ea1d2eb2bc9ae813c9b
Merge from live branch