Merge pull request #2145 from andreasBihlmaier:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 14 Jan 2014 07:55:28 +0000 (11:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 14 Jan 2014 07:55:29 +0000 (11:55 +0400)

Trivial merge