Merge pull request #1045 from bitwangyaoyao:2.4_fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 26 Jun 2013 12:55:06 +0000 (16:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 26 Jun 2013 12:55:06 +0000 (16:55 +0400)

Trivial merge