Merge pull request #2242 from jet47:gpu-test-fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 31 Jan 2014 13:24:21 +0000 (17:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 31 Jan 2014 13:24:21 +0000 (17:24 +0400)

Trivial merge