Merge pull request #2356 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 18 Feb 2014 08:14:57 +0000 (12:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 18 Feb 2014 08:14:57 +0000 (12:14 +0400)

Trivial merge