Merge pull request #555 from bitwangyaoyao:2.4_fixFft
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 26 Feb 2013 14:31:17 +0000 (18:31 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 26 Feb 2013 14:31:17 +0000 (18:31 +0400)

Trivial merge