Merge pull request #1983 from ilya-lavrenov:tapi_umat
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 13 Dec 2013 15:29:49 +0000 (19:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 13 Dec 2013 15:29:49 +0000 (19:29 +0400)

Trivial merge