Merge pull request #1389 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Tue, 3 Sep 2013 15:42:05 +0000 (19:42 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 3 Sep 2013 15:42:06 +0000 (19:42 +0400)

Trivial merge