# HG changeset patch
# User Chris Cannam
# Date 1352454264 0
# Node ID f8a93c42287b967c11c4dac9d7674ca940158a40
# Parent  a5af76c3fca02bae124604c7e8200aeb931f6481# Parent  3549525ba22a4c697e865881d0b64bb68baf81f7
Merge from branch "live"