Merge pull request #2383 from ilya-lavrenov:perf_match_template
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 20 Feb 2014 17:36:30 +0000 (21:36 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 20 Feb 2014 17:36:30 +0000 (21:36 +0400)

Trivial merge