Merge pull request #2153 from scottbreyfogle:constrained-hough-lines
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 3 Feb 2014 13:35:14 +0000 (17:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Feb 2014 13:35:15 +0000 (17:35 +0400)

Trivial merge