Merge pull request #925 from pengx17:2.4_canny_tmp_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 30 May 2013 08:01:08 +0000 (12:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 30 May 2013 08:01:09 +0000 (12:01 +0400)

Trivial merge