# HG changeset patch
# User Chris Cannam
# Date 1435324218 -3600
# Node ID f40ccbf228c221d5d6b2b83fad09f62bc7bd64b3
# Parent  6645b6b8356f81bd2a611f8539d1f034ae129009# Parent  b8187c83b93aa9de7eb0a3718a1488a2c8cdf4ae
Merge from branch simple-fft-model