Merge pull request #1296 from jet47:gpu-cvtcolor-fix-master
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 19 Aug 2013 10:26:12 +0000 (14:26 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 19 Aug 2013 10:26:12 +0000 (14:26 +0400)

Trivial merge