Merge pull request #865 from pengx17:2.4_ocl_ver
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 7 May 2013 12:39:49 +0000 (16:39 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 7 May 2013 12:39:49 +0000 (16:39 +0400)

Trivial merge