Merge pull request #2572 from jet47:gpu-generalized-hough
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 7 Apr 2014 07:57:52 +0000 (11:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 7 Apr 2014 07:57:52 +0000 (11:57 +0400)

Trivial merge