Merge pull request #1314 from jet47:ts-gpu-fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 21 Aug 2013 07:56:29 +0000 (11:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 21 Aug 2013 07:56:29 +0000 (11:56 +0400)

Trivial merge