Merge pull request #1803 from ilya-lavrenov:ocl_cvtColor
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 15 Nov 2013 11:55:29 +0000 (15:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 15 Nov 2013 11:55:29 +0000 (15:55 +0400)

Trivial merge