Merge pull request #1862 from alalek:ocl_disable_tests
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Sat, 23 Nov 2013 14:54:52 +0000 (18:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sat, 23 Nov 2013 14:54:52 +0000 (18:54 +0400)

Trivial merge