Merge pull request #532 from jet47:super-resolution
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Sun, 17 Mar 2013 15:13:37 +0000 (19:13 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sun, 17 Mar 2013 15:13:37 +0000 (19:13 +0400)

Trivial merge