Merge pull request #243 from takacsd:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 20 Dec 2012 12:58:14 +0000 (16:58 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 20 Dec 2012 12:58:14 +0000 (16:58 +0400)

Trivial merge