Merge pull request #1562 from ilya-lavrenov:ocl_integral
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 4 Oct 2013 14:12:42 +0000 (18:12 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 4 Oct 2013 14:12:43 +0000 (18:12 +0400)

Trivial merge