Merge pull request #1031 from pengx17:2.4_fix_converTo
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 24 Jun 2013 08:25:48 +0000 (12:25 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 24 Jun 2013 08:25:48 +0000 (12:25 +0400)

Trivial merge