Merge pull request #1920 from alalek:ocl_disable_workaround
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 5 Dec 2013 12:46:25 +0000 (16:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 5 Dec 2013 12:46:25 +0000 (16:46 +0400)

Trivial merge