Merge pull request #3279 from akarsakov:ocl_houghlines
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 9 Oct 2014 14:56:45 +0000 (14:56 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Thu, 9 Oct 2014 14:56:45 +0000 (14:56 +0000)

Trivial merge