Merge pull request #826 from pengx17:2.4_canny_clampfix
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 17 Apr 2013 07:09:49 +0000 (11:09 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 17 Apr 2013 07:09:49 +0000 (11:09 +0400)

Trivial merge