Merge pull request #710 from jet47:gpu-fix-compilation-issues
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 26 Mar 2013 11:31:22 +0000 (15:31 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 26 Mar 2013 11:31:22 +0000 (15:31 +0400)

Trivial merge