Merge pull request #1327 from alalek:ocl_master_tests_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 26 Aug 2013 12:44:37 +0000 (16:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 26 Aug 2013 12:44:37 +0000 (16:44 +0400)

Trivial merge