Merge pull request #2658 from akarsakov:ipp_hough
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 7 May 2014 13:07:22 +0000 (17:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 7 May 2014 13:07:22 +0000 (17:07 +0400)

Trivial merge