Merge pull request #2475 from ilya-lavrenov:ocl_2.4_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 14 Mar 2014 15:05:55 +0000 (19:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 14 Mar 2014 15:05:55 +0000 (19:05 +0400)

Trivial merge