Merge pull request #1027 from jet47:fix-cuda-4.2-build
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 20 Jun 2013 10:11:51 +0000 (14:11 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 20 Jun 2013 10:11:52 +0000 (14:11 +0400)

Trivial merge