Merge pull request #752 from khzimmer:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 3 Apr 2013 20:57:33 +0000 (00:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 3 Apr 2013 20:57:33 +0000 (00:57 +0400)

Trivial merge