Merge pull request #1626 from ilya-lavrenov:ocl_filters
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 18 Oct 2013 09:44:40 +0000 (13:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 18 Oct 2013 09:44:41 +0000 (13:44 +0400)

Trivial merge