Merge pull request #2786 from ElenaGvozdeva:ocl_matchTemplate
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 24 Jun 2014 16:12:42 +0000 (16:12 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 24 Jun 2014 16:12:42 +0000 (16:12 +0000)

Trivial merge