Merge pull request #2792 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 27 May 2014 08:44:23 +0000 (12:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 27 May 2014 08:44:23 +0000 (12:44 +0400)

Trivial merge