Merge pull request #2641 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 22 Apr 2014 08:01:03 +0000 (12:01 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 22 Apr 2014 08:01:03 +0000 (12:01 +0400)

Trivial merge