Merge pull request #1722 from StevenPuttemans:feature_1631_second
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 18 Nov 2013 11:48:27 +0000 (15:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 18 Nov 2013 11:48:27 +0000 (15:48 +0400)

Trivial merge