# HG changeset patch
# User Chris Cannam
# Date 1410276981 -3600
# Node ID 4a5d144bd5d0820a418e64d954d0ea3b0e0eeee4
# Parent  8432d2551fb2261a43506c3a24432270910e7b0d# Parent  d282967236d54945432cdfe5dbce0763d26488cc
Merge from default branch