Merge branch 'hough-lines-gpu'
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Wed, 15 Aug 2012 09:24:46 +0000 (13:24 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Wed, 15 Aug 2012 09:24:46 +0000 (13:24 +0400)

Trivial merge