Merge pull request #1810 from Nerei:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 18 Nov 2013 13:49:40 +0000 (17:49 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 18 Nov 2013 13:49:40 +0000 (17:49 +0400)

Trivial merge