Merge pull request #1860 from alalek:ocl_fix_undef_warn
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 25 Nov 2013 08:00:25 +0000 (12:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 25 Nov 2013 08:00:25 +0000 (12:00 +0400)

Trivial merge