# HG changeset patch
# User Chris Cannam
# Date 1410435980 -3600
# Node ID 404aa68d4227d76b37ae0dde875d699b7c58806f
# Parent  a5f2bdf3b486f00c6aa778ed8817eb22cdb5716f# Parent  fb9a134672536f194e476cbe2a6e89618dad7ff0
Merge from live branch