Merge pull request #1541 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 2 Oct 2013 10:47:29 +0000 (14:47 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 2 Oct 2013 10:47:30 +0000 (14:47 +0400)

Trivial merge