Merge pull request #2149 from ElenaGvozdeva:ocl_matchTemplate
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 24 Jan 2014 13:33:05 +0000 (17:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 24 Jan 2014 13:33:06 +0000 (17:33 +0400)

Trivial merge