Merge pull request #1874 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 28 Nov 2013 12:42:53 +0000 (16:42 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 28 Nov 2013 12:43:00 +0000 (16:43 +0400)

Trivial merge