Merge pull request #638 from bitwangyaoyao:2.4_fixErode
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 14 Mar 2013 07:41:02 +0000 (11:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 14 Mar 2013 07:41:02 +0000 (11:41 +0400)

Trivial merge