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

Trivial merge