# HG changeset patch
# User Chris Cannam
# Date 1411382831 -3600
# Node ID d8563d4879f31fea74ccc2f83fa26187ec3f333a
# Parent  6acf95ebd97d97ed0063c27dd2b2c4b1d0d11676# Parent  307619fa5546391c60faa6731f772cc03b28e22a
Merge