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

Trivial merge