Merge pull request #1428 from ilya-lavrenov:ocl_pyr
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 12 Sep 2013 08:48:44 +0000 (12:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 12 Sep 2013 08:48:45 +0000 (12:48 +0400)

Trivial merge