Merge pull request #784 from jet47:fix-gpu-build
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 8 Apr 2013 11:11:16 +0000 (15:11 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 8 Apr 2013 11:11:16 +0000 (15:11 +0400)

Trivial merge