Merge pull request #1454 from ilya-lavrenov:ocl_pyrUp
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 17 Sep 2013 10:03:40 +0000 (14:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 17 Sep 2013 10:03:40 +0000 (14:03 +0400)

Trivial merge