Merge pull request #2854 from ilya-lavrenov:tapi_filter2d
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 17 Jun 2014 12:59:00 +0000 (16:59 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 17 Jun 2014 12:59:00 +0000 (16:59 +0400)

Trivial merge