# HG changeset patch
# User Chris Cannam
# Date 1310636690 -3600
# Node ID c3c01edd24bb5b8b8734e6015a430c2f600a726d
# Parent  c1f5f029918010fcbaf33b19b7da53507d0cac4e# Parent  107d36338b70fa961bd32f62189a5aee56216f9b
Merge from branch "live"