Merge pull request #1254 from pengx17:2.4_filter2d_
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 14 Aug 2013 13:27:17 +0000 (17:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 14 Aug 2013 13:27:18 +0000 (17:27 +0400)

Trivial merge