Merge pull request #1087 from znah:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 5 Jul 2013 08:07:44 +0000 (12:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 5 Jul 2013 08:07:45 +0000 (12:07 +0400)

Trivial merge