Merge pull request #541 from bitwangyaoyao:2.4_fixCvtColor
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 25 Feb 2013 10:04:01 +0000 (14:04 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 25 Feb 2013 10:04:02 +0000 (14:04 +0400)

Trivial merge