Merge pull request #1718 from SpecLad:have-opencv-ocl
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 30 Oct 2013 13:33:03 +0000 (17:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 30 Oct 2013 13:33:03 +0000 (17:33 +0400)

Trivial merge