Merge pull request #1378 from StevenPuttemans:bugfix_3115
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 3 Sep 2013 08:07:24 +0000 (12:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Sep 2013 08:07:24 +0000 (12:07 +0400)

Trivial merge