Merge pull request #3118 from akarsakov:fix_cvtcolor_perf
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 18 Aug 2014 12:45:35 +0000 (12:45 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Mon, 18 Aug 2014 12:45:35 +0000 (12:45 +0000)

Trivial merge