Merge pull request #1869 from ilya-lavrenov:ocl_cvtColor_master
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 27 Nov 2013 13:58:53 +0000 (17:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 27 Nov 2013 13:58:54 +0000 (17:58 +0400)

Trivial merge