Merge pull request #325 from bitwangyaoyao:2.4_fixcanny
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 24 Jan 2013 20:46:34 +0000 (00:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 24 Jan 2013 20:46:35 +0000 (00:46 +0400)

Trivial merge