Merge pull request #1376 from StevenPuttemans:bugfix_3186
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 9 Sep 2013 14:33:11 +0000 (18:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 9 Sep 2013 14:33:11 +0000 (18:33 +0400)

Trivial merge