Merge pull request #2772 from akarsakov:ocl_pyramids
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 22 May 2014 09:23:49 +0000 (13:23 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 22 May 2014 09:23:50 +0000 (13:23 +0400)

Trivial merge