Merge pull request #2391 from ilya-lavrenov:tapi_match_template
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 4 Mar 2014 14:50:14 +0000 (18:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 4 Mar 2014 14:50:14 +0000 (18:50 +0400)

Trivial merge