Merge pull request #525 from odeniz:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 28 Feb 2013 14:05:55 +0000 (18:05 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 28 Feb 2013 14:05:55 +0000 (18:05 +0400)

Trivial merge