Merge pull request #1294 from jet47:gpu-tests-fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 19 Aug 2013 10:21:50 +0000 (14:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 19 Aug 2013 10:21:50 +0000 (14:21 +0400)

Trivial merge