Merge pull request #2742 from StevenPuttemans:feature_3176
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 22 May 2014 14:03:56 +0000 (18:03 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 22 May 2014 14:03:56 +0000 (18:03 +0400)

Trivial merge