Merge pull request #1984 from ilya-lavrenov:tapi_perf
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 25 Dec 2013 20:13:28 +0000 (00:13 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 25 Dec 2013 20:13:28 +0000 (00:13 +0400)

Trivial merge