# HG changeset patch
# User Chris Cannam
# Date 1479742388 0
# Node ID b5c88c448ca2bf7e5070177c7561ba15a929bd88
# Parent  236ecb2c07584a873b47049f42fa0b2668115edb# Parent  6796afa25c8847470e6c4634d4a38f974781b440
Merge from branch bqfft