Merge pull request #1538 from StevenPuttemans:bugfix_3283
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 8 Oct 2013 09:00:38 +0000 (13:00 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 8 Oct 2013 09:00:39 +0000 (13:00 +0400)

Trivial merge