Merge pull request #1937 from ilya-lavrenov:tapi_integral
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 6 Dec 2013 11:25:56 +0000 (15:25 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 6 Dec 2013 11:25:56 +0000 (15:25 +0400)

Trivial merge