Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 3 Feb 2014 10:10:20 +0000 (14:10 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 10:10:21 +0000 (14:10 +0400)

Trivial merge