Merge pull request #1581 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 9 Oct 2013 08:33:49 +0000 (12:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 9 Oct 2013 08:33:50 +0000 (12:33 +0400)

Trivial merge