Merge pull request #776 from virtuald:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Tue, 9 Apr 2013 04:51:09 +0000 (08:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 9 Apr 2013 04:51:09 +0000 (08:51 +0400)

Trivial merge