# HG changeset patch
# User Chris Cannam
# Date 1358946685 0
# Node ID 1b1138f6f55ee01ccaa3b80f40da04cd90b325d5
# Parent  b9e34a051f82f5ae4e0e2dfff7825b20808b8905# Parent  e60f4ccfdc70c5a8cb241c86f8e470fe3bf3f585
Merge from branch live