Merge pull request #2812 from arkunze:pullreq/140520-filter2D
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 4 Jun 2014 08:20:54 +0000 (12:20 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 4 Jun 2014 08:20:54 +0000 (12:20 +0400)

Trivial merge