Merge pull request #2340 from ilya-lavrenov:tapi_lab
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 17 Feb 2014 12:45:40 +0000 (16:45 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 17 Feb 2014 12:45:40 +0000 (16:45 +0400)

Trivial merge