Merge pull request #2310 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 11 Feb 2014 09:44:51 +0000 (13:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 11 Feb 2014 09:44:51 +0000 (13:44 +0400)

Trivial merge