Merge pull request #1137 from StevenPuttemans:bugfix_3131_24
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 18 Jul 2013 12:02:46 +0000 (16:02 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 18 Jul 2013 12:02:47 +0000 (16:02 +0400)

Trivial merge