# HG changeset patch
# User Chris Cannam
# Date 1403696317 -3600
# Node ID aede6e90a6b8a09ab58d80ff2d0321c127ad9bd6
# Parent  feac60b5d82bc70d29a4a2b9b87aa0725916fa24# Parent  bca93a149bd7a3f1c368850f581ba64e2ea05b8c
Merge (but taking everything from the more recent default)