Merge pull request #1527 from vpisarev:shape_module
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 3 Oct 2013 07:54:40 +0000 (11:54 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 3 Oct 2013 07:54:41 +0000 (11:54 +0400)

Trivial merge