Merge pull request #1633 from ilya-lavrenov:ocl_imgproc
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 21 Oct 2013 11:58:59 +0000 (15:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 21 Oct 2013 11:59:00 +0000 (15:59 +0400)

Trivial merge