Merge pull request #935 from pengx17:2.4_filter2d_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Tue, 4 Jun 2013 09:34:39 +0000 (13:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 4 Jun 2013 09:34:40 +0000 (13:34 +0400)

Trivial merge