Merge pull request #715 from pengx17:2.4_canny_buf
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 27 Mar 2013 09:19:40 +0000 (13:19 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 27 Mar 2013 09:19:40 +0000 (13:19 +0400)

Trivial merge