Merge pull request #1196 from rdm12:bugfix_3121_cvtcolor
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 5 Aug 2013 08:52:15 +0000 (12:52 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 5 Aug 2013 08:52:15 +0000 (12:52 +0400)

Trivial merge