Merge pull request #760 from alekcac:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Thu, 4 Apr 2013 14:44:34 +0000 (18:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 4 Apr 2013 14:44:35 +0000 (18:44 +0400)

Trivial merge