Merge pull request #2469 from alalek:ocl_pyrUp_pyrDown_3channels
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 13 Mar 2014 14:37:05 +0000 (18:37 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 13 Mar 2014 14:37:05 +0000 (18:37 +0400)

Trivial merge