Merge pull request #1841 from ilya-lavrenov:ocl_kernel_compilation
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 21 Nov 2013 13:32:36 +0000 (17:32 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 21 Nov 2013 13:32:37 +0000 (17:32 +0400)

Trivial merge