# HG changeset patch
# User Chris Cannam
# Date 1435771888 -3600
# Node ID 1b4e5a567d5819afabbf4ec79647cf6e608e019b
# Parent  83370e830c956be0fc4a7d9b5c30761b6ffb7613# Parent  39ab248a49989ebecf87a072390b564f9306b7a1
Merge from branch simple-fft-model