Merge pull request #783 from pengx17:master_matchTemplate_dft
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 9 Apr 2013 04:53:16 +0000 (08:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 9 Apr 2013 04:53:17 +0000 (08:53 +0400)

Trivial merge