Merge pull request #1857 from alalek:ocl_ta_tests_infra
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Sat, 23 Nov 2013 12:44:58 +0000 (16:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sat, 23 Nov 2013 12:44:58 +0000 (16:44 +0400)

Trivial merge