Merge pull request #1958 from vbystricky:ocl_filter2D
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 11 Dec 2013 12:41:12 +0000 (16:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 11 Dec 2013 12:41:12 +0000 (16:41 +0400)

Trivial merge