Merge pull request #2248 from jet47:gpu-npp-disable
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 31 Jan 2014 16:48:52 +0000 (20:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 31 Jan 2014 16:48:52 +0000 (20:48 +0400)

Trivial merge