Merge pull request #2654 from ElenaGvozdeva:ipp_DFT
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 28 Apr 2014 11:14:40 +0000 (15:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 28 Apr 2014 11:14:40 +0000 (15:14 +0400)

Trivial merge