Merge pull request #3318 from akarsakov:ocl_cvtcolor
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 29 Oct 2014 14:25:09 +0000 (14:25 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 29 Oct 2014 14:25:09 +0000 (14:25 +0000)

Trivial merge