# HG changeset patch
# User Chris Cannam
# Date 1315298911 -3600
# Node ID de8f268e7f124fe1f928383a678b3d7c05b1c47e
# Parent  3ebf9b76e57f1e34db3f0baa0988f0c435b15d75# Parent  eaec823e6e23e030a48ec1c66a0f5657159fbc8b
Merge from branch "live"