# HG changeset patch
# User Chris Cannam
# Date 1381480438 -3600
# Node ID 2b7911132501a1a81a8777a9d523703f139e18a9
# Parent  04cc33a44d4ccadf075bfdac9d48e92d8144b9fa# Parent  96973aaacd75300b93bbf7c9215da5fd51525d29
Merge from cannam branch