Merge pull request #1412 from jet47:gpu-match-template-nocuda
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Sep 2013 12:49:33 +0000 (16:49 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Sep 2013 12:49:33 +0000 (16:49 +0400)

Trivial merge