Merge pull request #473 from prclibo:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Mon, 11 Feb 2013 16:48:03 +0000 (20:48 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 11 Feb 2013 16:48:03 +0000 (20:48 +0400)

Trivial merge