Merge pull request #903 from aks2:2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 11 Jun 2013 13:35:38 +0000 (17:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 11 Jun 2013 13:35:39 +0000 (17:35 +0400)

Trivial merge