Merge pull request #2580 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 7 Apr 2014 14:29:51 +0000 (18:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 7 Apr 2014 14:29:51 +0000 (18:29 +0400)

Trivial merge