# HG changeset patch
# User Chris Cannam
# Date 1352733437 0
# Node ID 52be96e8308021ca7cc818e76fa63b2abe20e01d
# Parent  48ddad528c51ada8ebb1d1a9c6a59672a84637e2# Parent  e3f78fa30a3603000c432aa7938de8c88db355bc
Merge from branch "live"