Merge pull request #267 from pclove1:ocl_hough
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Sat, 19 Jan 2013 08:02:14 +0000 (12:02 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sat, 19 Jan 2013 08:02:14 +0000 (12:02 +0400)

Trivial merge