Merge pull request #2240 from jet47:gpu-generalized-hough
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 31 Jan 2014 10:24:04 +0000 (14:24 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 31 Jan 2014 10:24:04 +0000 (14:24 +0400)

Trivial merge