Merge pull request #2841 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 10 Jun 2014 07:50:12 +0000 (11:50 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 10 Jun 2014 07:50:12 +0000 (11:50 +0400)

Trivial merge