# HG changeset patch
# User Chris Cannam
# Date 1307354332 -3600
# Node ID 897979555864fbef4806a87ed6abdf098637c7f2
# Parent  3d2f1bea385aa7c09ce4a170a948a0c3f7125486# Parent  dcf38f417f1fc18f17b1b47b7ea99624d1b984d7
Merge from branch "live"