Merge pull request #1762 from jet47:cuda-6.0-npp-fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Fri, 6 Dec 2013 11:56:14 +0000 (15:56 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 6 Dec 2013 11:56:15 +0000 (15:56 +0400)

Trivial merge