Merge pull request #805 from pengx17:master_canny_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 12 Apr 2013 09:46:07 +0000 (13:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 12 Apr 2013 09:46:07 +0000 (13:46 +0400)

Trivial merge