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

Trivial merge