Merge pull request #1988 from ilya-lavrenov:tapi_umat_convertTo
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 16 Dec 2013 09:04:21 +0000 (13:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 16 Dec 2013 09:04:21 +0000 (13:04 +0400)

Trivial merge