Merge pull request #632 from pengx17:2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 15 Mar 2013 06:34:43 +0000 (10:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 15 Mar 2013 06:34:43 +0000 (10:34 +0400)

Trivial merge