Merge pull request #1933 from gongzg:fix-ocl-kernel-2.4
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 5 Dec 2013 13:05:25 +0000 (17:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 5 Dec 2013 13:05:25 +0000 (17:05 +0400)

Trivial merge