Merge pull request #485 from jet47:gpu-new-functionality
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 14 Feb 2013 12:00:55 +0000 (16:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 14 Feb 2013 12:00:55 +0000 (16:00 +0400)

Trivial merge