Merge pull request #264 from kirill-kornyakov:remove-hack-from-hough-lines-perf-test
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 26 Dec 2012 08:53:50 +0000 (12:53 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 26 Dec 2012 08:53:50 +0000 (12:53 +0400)

Trivial merge