Merge pull request #1613 from alalek:ocl_cvtcolor
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 17 Oct 2013 08:07:20 +0000 (12:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 17 Oct 2013 08:07:20 +0000 (12:07 +0400)

Trivial merge