Merge pull request #2835 from ilya-lavrenov:defects
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Tue, 10 Jun 2014 15:29:46 +0000 (19:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 10 Jun 2014 15:29:47 +0000 (19:29 +0400)

Trivial merge