Merge pull request #428 from bitwangyaoyao:2.4_erode_dilate
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 8 Feb 2013 14:48:36 +0000 (18:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 8 Feb 2013 14:48:37 +0000 (18:48 +0400)

Trivial merge