Merge pull request #1796 from ilya-lavrenov:ocl_cvtColor
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 14 Nov 2013 10:46:42 +0000 (14:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 14 Nov 2013 10:46:43 +0000 (14:46 +0400)

Trivial merge