Merge pull request #1210 from pengx17:2.4_ocl_surf_intel_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 16 Aug 2013 08:22:18 +0000 (12:22 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 16 Aug 2013 08:22:18 +0000 (12:22 +0400)

Trivial merge