Merge pull request #520 from jet47:gpu-updates
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 21 Feb 2013 14:03:06 +0000 (18:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 21 Feb 2013 14:03:06 +0000 (18:03 +0400)

Trivial merge