# HG changeset patch
# User Chris Cannam
# Date 1352819314 0
# Node ID ff783f2cc500b2f26530e1583cabee99e6af9825
# Parent  e3f78fa30a3603000c432aa7938de8c88db355bc# Parent  f6c71883b99595328acf3db8e1c116cb38d3a71c
Merge from branch cannam