Merge pull request #1170 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 24 Jul 2013 09:45:32 +0000 (13:45 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 24 Jul 2013 09:45:33 +0000 (13:45 +0400)

Trivial merge