Merge pull request #982 from pengx17:2.4_fix_two_bugs
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 13 Jun 2013 12:55:12 +0000 (16:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 13 Jun 2013 12:55:12 +0000 (16:55 +0400)

Trivial merge