Merge pull request #512 from jet47:core-gpu-updates
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 21 Feb 2013 08:22:03 +0000 (12:22 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 21 Feb 2013 08:22:04 +0000 (12:22 +0400)

Trivial merge