Merge pull request #2675 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 28 Apr 2014 09:51:44 +0000 (13:51 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 28 Apr 2014 09:51:44 +0000 (13:51 +0400)

Trivial merge