Merge pull request #2421 from akarsakov:fix_ocl_haar_intel
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 28 Feb 2014 14:22:03 +0000 (18:22 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 28 Feb 2014 14:22:03 +0000 (18:22 +0400)

Trivial merge