Merge pull request #931 from jet47:gpu-test-fixes
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 31 May 2013 12:46:30 +0000 (16:46 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 31 May 2013 12:46:31 +0000 (16:46 +0400)

Trivial merge