Merge pull request #836 from jet47:gpu-modules
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 18 Apr 2013 10:51:23 +0000 (14:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 18 Apr 2013 10:51:26 +0000 (14:51 +0400)

Trivial merge