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

Trivial merge