Merge pull request #1081 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Fri, 5 Jul 2013 09:34:58 +0000 (13:34 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Fri, 5 Jul 2013 09:34:59 +0000 (13:34 +0400)

Trivial merge