Merge pull request #1940 from pentschev:ocl_bfm_oclMat_ptr_fix_2.4
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 6 Dec 2013 11:05:34 +0000 (15:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 6 Dec 2013 11:05:34 +0000 (15:05 +0400)

Trivial merge