Merge pull request #2617 from ElenaGvozdeva:ipp_matchTemplate
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 15 Apr 2014 15:56:38 +0000 (19:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 15 Apr 2014 15:56:38 +0000 (19:56 +0400)

Trivial merge