# HG changeset patch
# User Chris Cannam
# Date 1411993670 -3600
# Node ID 260024e62b6b2be94f63c25395bc8e8d141862e5
# Parent  ff52a5b766f7717d5af5b61459e0553f7f622a53# Parent  6ed771ba65f4d55d1e96f6c494e156ed4f5ab04a
Merge from branch 2.4-stable