Merge pull request #1136 from StevenPuttemans:bugfix_3157
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 17 Jul 2013 13:51:27 +0000 (17:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 17 Jul 2013 13:51:28 +0000 (17:51 +0400)

Trivial merge