Merge pull request #450 from bitwangyaoyao:2.4_dft
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 8 Feb 2013 14:43:34 +0000 (18:43 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 8 Feb 2013 14:43:34 +0000 (18:43 +0400)

Trivial merge