Merge pull request #1956 from ilya-lavrenov:tapi_split_merge
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Dec 2013 12:56:06 +0000 (16:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Dec 2013 12:56:06 +0000 (16:56 +0400)

Trivial merge