Merge pull request #1847 from ilya-lavrenov:ocl_imgproc_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 21 Nov 2013 17:29:26 +0000 (21:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 21 Nov 2013 17:29:26 +0000 (21:29 +0400)

Trivial merge