Merge pull request #2871 from vbystricky:oclopt_integral
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 17 Jun 2014 14:23:31 +0000 (18:23 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 17 Jun 2014 14:23:31 +0000 (18:23 +0400)

Trivial merge