Merge pull request #2717 from StevenPuttemans:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 12 May 2014 11:14:53 +0000 (15:14 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 12 May 2014 11:14:53 +0000 (15:14 +0400)

Trivial merge