Merge pull request #740 from evil0sheep:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 11 Apr 2013 07:33:30 +0000 (11:33 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 11 Apr 2013 07:33:31 +0000 (11:33 +0400)

Trivial merge