Merge pull request #1781 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 11 Nov 2013 15:15:25 +0000 (19:15 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 11 Nov 2013 15:15:25 +0000 (19:15 +0400)

Trivial merge