Merge pull request #2455 from ilya-lavrenov:tapi_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 11 Mar 2014 11:58:32 +0000 (15:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 11 Mar 2014 11:58:32 +0000 (15:58 +0400)

Trivial merge