Merge pull request #1840 from ilya-lavrenov:ocl_cvtColor
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 21 Nov 2013 13:32:53 +0000 (17:32 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 21 Nov 2013 13:32:53 +0000 (17:32 +0400)

Trivial merge