Merge pull request #324 from bitwangyaoyao:2.4_cvtcolor
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 24 Jan 2013 20:53:41 +0000 (00:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 24 Jan 2013 20:53:42 +0000 (00:53 +0400)

Trivial merge