Merge pull request #3317 from akarsakov:ocl_cvtcolor_perf_tests
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 8 Oct 2014 14:44:21 +0000 (14:44 +0000)
committerAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 8 Oct 2014 14:44:21 +0000 (14:44 +0000)

Trivial merge