Merge pull request #505 from abidrahmank:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 20 Feb 2013 08:29:52 +0000 (12:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 20 Feb 2013 08:29:53 +0000 (12:29 +0400)

Trivial merge