Merge pull request #2435 from SpecLad:merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 3 Mar 2014 11:41:06 +0000 (15:41 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 3 Mar 2014 11:41:06 +0000 (15:41 +0400)

Trivial merge