Merge pull request #746 from jet47:fix-gpu-compilation
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 3 Apr 2013 11:58:47 +0000 (15:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 3 Apr 2013 11:58:48 +0000 (15:58 +0400)

Trivial merge