# HG changeset patch
# User Chris Cannam
# Date 1435324471 -3600
# Node ID 83370e830c956be0fc4a7d9b5c30761b6ffb7613
# Parent  3485d324c172e92e6f47156ef586692fc28b0c36# Parent  1020db1698c01ab04851fcb583e9e26a0bad7c1f
Merge from branch simple-fft-model