Merge pull request #1787 from hs3180:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 19 Nov 2013 10:21:25 +0000 (14:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 19 Nov 2013 10:21:25 +0000 (14:21 +0400)

Trivial merge