Merge pull request #1969 from KonstantinMatskevich:ocl_tapi_minmaxloc
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 17 Dec 2013 12:42:44 +0000 (16:42 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 17 Dec 2013 12:42:44 +0000 (16:42 +0400)

Trivial merge