Merge pull request #1606 from ilya-lavrenov:ocl_imgproc
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Sat, 12 Oct 2013 12:10:03 +0000 (16:10 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sat, 12 Oct 2013 12:10:04 +0000 (16:10 +0400)

Trivial merge