Merge pull request #2045 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 25 Dec 2013 12:18:00 +0000 (16:18 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 25 Dec 2013 12:18:00 +0000 (16:18 +0400)

Trivial merge