Merge pull request #2541 from JinoBetti:2.4
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 31 Mar 2014 11:48:45 +0000 (15:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 31 Mar 2014 11:48:45 +0000 (15:48 +0400)

Trivial merge