# HG changeset patch
# User Chris Cannam
# Date 1404466657 -3600
# Node ID 879bdc878826bebec67130326f99397c430419b1
# Parent  0b732c03ec571a7987c6e8850cee67d76e6a25a6# Parent  553a5f65ef64811747a6613f759622d655db63c1
Ah, we've already done this. Merge, taking everything from the branch with the older commits.