Merge pull request #2175 from vrabaud:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 23 Jan 2014 09:27:37 +0000 (13:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 23 Jan 2014 09:27:38 +0000 (13:27 +0400)

Trivial merge