# HG changeset patch
# User Chris Cannam
# Date 1403006110 -3600
# Node ID 5d2966b7c201500967f4132b20acabcb5ed4d96c
# Parent  734ee80286c33f445b0584e077344a7e3862e1a2# Parent  ddae586bc47bbe718d625109065b06d11d23db8a
Merge from default branch