Merge pull request #3186 from akarsakov:ocl_fixes
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 4 Sep 2014 08:54:24 +0000 (08:54 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 4 Sep 2014 08:54:24 +0000 (08:54 +0000)

Trivial merge