Merge pull request #365 from ivan-korolev:fix_HoughLines_segfault
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 30 Jan 2013 11:16:30 +0000 (15:16 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 30 Jan 2013 11:16:30 +0000 (15:16 +0400)

Trivial merge