Merge pull request #1748 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 6 Nov 2013 08:55:04 +0000 (12:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 6 Nov 2013 08:55:05 +0000 (12:55 +0400)

Trivial merge