Merge pull request #781 from bitwangyaoyao:2.4_fixerr
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 12 Apr 2013 09:44:58 +0000 (13:44 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 12 Apr 2013 09:44:59 +0000 (13:44 +0400)

Trivial merge