Merge pull request #1880 from ilya-lavrenov:tapi_cvtColor
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 29 Nov 2013 08:59:08 +0000 (12:59 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 29 Nov 2013 08:59:09 +0000 (12:59 +0400)

Trivial merge