Merge pull request #1961 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 10 Dec 2013 10:39:35 +0000 (14:39 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 10 Dec 2013 10:39:35 +0000 (14:39 +0400)

Trivial merge