Merge pull request #2177 from ilya-lavrenov:ocl_superres
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 21 Jan 2014 13:05:50 +0000 (17:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 21 Jan 2014 13:05:50 +0000 (17:05 +0400)

Trivial merge