Merge pull request #2804 from ilya-lavrenov:tapi_perf
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 29 May 2014 20:38:11 +0000 (00:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 29 May 2014 20:38:11 +0000 (00:38 +0400)

Trivial merge