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

Trivial merge