Merge pull request #652 from Daniil-Osokin:fixCvtColorHeader
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 18 Mar 2013 11:56:33 +0000 (15:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 18 Mar 2013 11:56:33 +0000 (15:56 +0400)

Trivial merge