Merge pull request #1250 from denzp:opencl_detection_unix
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 13 Aug 2013 07:57:22 +0000 (11:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 13 Aug 2013 07:57:22 +0000 (11:57 +0400)

Trivial merge