Merge pull request #790 from jet47:fix-gpu-build
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 9 Apr 2013 09:14:37 +0000 (13:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 9 Apr 2013 09:14:37 +0000 (13:14 +0400)

Trivial merge