Merge pull request #2326 from vpisarev:ocl_ch3
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 14 Feb 2014 11:49:36 +0000 (15:49 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 14 Feb 2014 11:49:36 +0000 (15:49 +0400)

Trivial merge