Merge pull request #2708 from StevenPuttemans:2.4
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Thu, 8 May 2014 13:02:40 +0000 (17:02 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 8 May 2014 13:02:40 +0000 (17:02 +0400)

Trivial merge