Merge pull request #1631 from alalek:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 16 Oct 2013 09:38:30 +0000 (13:38 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 16 Oct 2013 09:38:31 +0000 (13:38 +0400)

Trivial merge