# HG changeset patch
# User Chris Cannam
# Date 1479742335 0
# Node ID 83c21fa74e0353c53275a55c7eed0ba0588bf602
# Parent  750577301795407c3bd7cf72e3ad48d92be707c1# Parent  59c89f0b2a3be9829ca26b44d9096e9869b05dbb
Merge from branch bqfft