Merge pull request #1284 from melody-rain:superres_example_2
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 16 Aug 2013 12:07:41 +0000 (16:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 16 Aug 2013 12:07:41 +0000 (16:07 +0400)

Trivial merge