Merge pull request #1297 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 20 Aug 2013 10:10:21 +0000 (14:10 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 20 Aug 2013 10:10:22 +0000 (14:10 +0400)

Trivial merge