Merge pull request #2855 from ilya-lavrenov:tapi_warpp_fix
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Mon, 16 Jun 2014 09:22:03 +0000 (13:22 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 16 Jun 2014 09:22:03 +0000 (13:22 +0400)

Trivial merge