Merge pull request #2483 from ilya-lavrenov:tapi_3_vs_4
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 14 Mar 2014 15:14:35 +0000 (19:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 14 Mar 2014 15:14:35 +0000 (19:14 +0400)

Trivial merge