# HG changeset patch
# User Chris Cannam
# Date 1310641754 -3600
# Node ID a2192366d309c34d7f1199b0d7cbe4a41088fe4c
# Parent  d745461ca8b6bcdd1709898c0e12d37db4ec4ff9# Parent  bd1d512f9e1b4957dae1dc61641cd937566335c9
Merge from branch "live"