Merge pull request #1049 from pengx17:2.4_superres_ocl
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 15 Jul 2013 07:43:08 +0000 (11:43 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 15 Jul 2013 07:43:09 +0000 (11:43 +0400)

Trivial merge