fixed a botched kiss_fft merge

Botched the kiss_fft merge, please pull as soon as possible.