Merge pull request #1794 from vrabaud:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 14 Nov 2013 12:43:50 +0000 (16:43 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 14 Nov 2013 12:43:50 +0000 (16:43 +0400)

Trivial merge