Merge pull request #1148 from StevenPuttemans:patch_3125
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 19 Jul 2013 08:48:49 +0000 (12:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 19 Jul 2013 08:48:49 +0000 (12:48 +0400)

Trivial merge