Merge pull request #1993 from StevenPuttemans:feature_2862
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 17 Dec 2013 09:19:59 +0000 (13:19 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 17 Dec 2013 09:19:59 +0000 (13:19 +0400)

Trivial merge