Merge pull request #2486 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 18 Mar 2014 09:55:56 +0000 (13:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 18 Mar 2014 09:55:57 +0000 (13:55 +0400)

Trivial merge