Merge pull request #2143 from Daniil-Osokin:fix_docs_cvt_color_alpha_channel
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 17 Jan 2014 06:43:39 +0000 (10:43 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 17 Jan 2014 06:43:40 +0000 (10:43 +0400)

Trivial merge